diff options
| author | Florian Fainelli <florian@openwrt.org> | 2014-09-27 19:10:51 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2014-09-27 19:10:51 +0000 |
| commit | c65ec1aa8fbcbafdc568c4206286ca77f3234caf (patch) | |
| tree | 563323b952b96b10d5cca5b124de2cd9266259b0 /target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch | |
| parent | 7771ecddf3b18914aa513ef818042516f61e79a9 (diff) | |
| download | upstream-c65ec1aa8fbcbafdc568c4206286ca77f3234caf.tar.gz upstream-c65ec1aa8fbcbafdc568c4206286ca77f3234caf.tar.bz2 upstream-c65ec1aa8fbcbafdc568c4206286ca77f3234caf.zip | |
brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y
against linux-stable/v3.10.49.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42678 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch b/target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch index 556919ced6..a5321f6c7d 100644 --- a/target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch +++ b/target/linux/brcm2708/patches-3.10/0142-V4L2-Enable-MJPEG-encoding.patch @@ -1,7 +1,7 @@ -From 9878725ea0cedbc79d962e0ac041acdc1135d79c Mon Sep 17 00:00:00 2001 +From 640a6391ca5a617196bb250d3378f775fe16b9f8 Mon Sep 17 00:00:00 2001 From: Dave Stevenson <dsteve@broadcom.com> Date: Mon, 23 Dec 2013 15:42:21 +0000 -Subject: [PATCH 142/174] V4L2: Enable MJPEG encoding +Subject: [PATCH 142/196] V4L2: Enable MJPEG encoding Requires GPU firmware update to support MJPEG encoder. @@ -11,6 +11,8 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com> drivers/media/platform/bcm2835/mmal-encodings.h | 1 + 2 files changed, 8 insertions(+) +diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c +index 4780107..166039e 100644 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c @@ -100,6 +100,13 @@ static struct mmal_fmt formats[] = { @@ -27,6 +29,8 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com> } }; +diff --git a/drivers/media/platform/bcm2835/mmal-encodings.h b/drivers/media/platform/bcm2835/mmal-encodings.h +index 856e80e..764bb12 100644 --- a/drivers/media/platform/bcm2835/mmal-encodings.h +++ b/drivers/media/platform/bcm2835/mmal-encodings.h @@ -27,6 +27,7 @@ @@ -37,3 +41,6 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com> #define MMAL_ENCODING_JPEG MMAL_FOURCC('J', 'P', 'E', 'G') #define MMAL_ENCODING_GIF MMAL_FOURCC('G', 'I', 'F', ' ') +-- +1.9.1 + |