git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
omap
/
omap_voutlib.c
diff --git
a/drivers/media/video/omap/omap_voutlib.c
b/drivers/media/video/omap/omap_voutlib.c
index
2aa6a76
..
8ae7481
100644
(file)
--- a/
drivers/media/video/omap/omap_voutlib.c
+++ b/
drivers/media/video/omap/omap_voutlib.c
@@
-193,7
+193,7
@@
int omap_vout_new_crop(struct v4l2_pix_format *pix,
return -EINVAL;
if (cpu_is_omap24xx()) {
return -EINVAL;
if (cpu_is_omap24xx()) {
- if (
crop->
height != win->w.height) {
+ if (
try_crop.
height != win->w.height) {
/* If we're resizing vertically, we can't support a
* crop width wider than 768 pixels.
*/
/* If we're resizing vertically, we can't support a
* crop width wider than 768 pixels.
*/
@@
-202,7
+202,7
@@
int omap_vout_new_crop(struct v4l2_pix_format *pix,
}
}
/* vertical resizing */
}
}
/* vertical resizing */
- vresize = (1024 *
crop->
height) / win->w.height;
+ vresize = (1024 *
try_crop.
height) / win->w.height;
if (cpu_is_omap24xx() && (vresize > 2048))
vresize = 2048;
else if (cpu_is_omap34xx() && (vresize > 4096))
if (cpu_is_omap24xx() && (vresize > 2048))
vresize = 2048;
else if (cpu_is_omap34xx() && (vresize > 4096))
@@
-221,7
+221,7
@@
int omap_vout_new_crop(struct v4l2_pix_format *pix,
try_crop.height = 2;
}
/* horizontal resizing */
try_crop.height = 2;
}
/* horizontal resizing */
- hresize = (1024 *
crop->
width) / win->w.width;
+ hresize = (1024 *
try_crop.
width) / win->w.width;
if (cpu_is_omap24xx() && (hresize > 2048))
hresize = 2048;
else if (cpu_is_omap34xx() && (hresize > 4096))
if (cpu_is_omap24xx() && (hresize > 2048))
hresize = 2048;
else if (cpu_is_omap34xx() && (hresize > 4096))