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/0141-V4L2-Fix-issue-when-switching-down-JPEG-resolution.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/0141-V4L2-Fix-issue-when-switching-down-JPEG-resolution.patch')
-rw-r--r-- | target/linux/brcm2708/patches-3.10/0141-V4L2-Fix-issue-when-switching-down-JPEG-resolution.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0141-V4L2-Fix-issue-when-switching-down-JPEG-resolution.patch b/target/linux/brcm2708/patches-3.10/0141-V4L2-Fix-issue-when-switching-down-JPEG-resolution.patch index ee16189e77..2d7069cc73 100644 --- a/target/linux/brcm2708/patches-3.10/0141-V4L2-Fix-issue-when-switching-down-JPEG-resolution.patch +++ b/target/linux/brcm2708/patches-3.10/0141-V4L2-Fix-issue-when-switching-down-JPEG-resolution.patch @@ -1,7 +1,7 @@ -From 50a40e8c2a9014c62943b034edefa035c0647519 Mon Sep 17 00:00:00 2001 +From 8a529de86bee2dd7e76fc77d0364ace6df3da685 Mon Sep 17 00:00:00 2001 From: Dave Stevenson <dsteve@broadcom.com> Date: Mon, 9 Dec 2013 11:24:55 +0000 -Subject: [PATCH 141/174] V4L2: Fix issue when switching down JPEG resolution. +Subject: [PATCH 141/196] V4L2: Fix issue when switching down JPEG resolution. JPEG buffer size calculation is based on input resolution. Input resolution was being configured after output port @@ -13,9 +13,11 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com> drivers/media/platform/bcm2835/bcm2835-camera.c | 126 ++++++++++++++---------- 1 file changed, 72 insertions(+), 54 deletions(-) +diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c +index 9fc90a2..4780107 100644 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c -@@ -955,69 +955,87 @@ static int mmal_setup_components(struct +@@ -955,69 +955,87 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, camera_port->current_buffer.num = camera_port->recommended_buffer.num; @@ -157,3 +159,6 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com> } } else { /* configure buffering */ +-- +1.9.1 + |