diff options
| author | Samreen <samreen@ti.com> | 2010-08-05 12:21:34 +0530 |
|---|---|---|
| committer | Ricardo Perez Olivares <x0081762@ti.com> | 2010-09-14 19:27:03 -0500 |
| commit | 8ce14ef96c77515d8946c1ae46c9c85c98a9ab62 (patch) | |
| tree | 2a22faed162ea2769efac5f452613146087e3239 /drivers/media | |
| parent | c18840e0bfd0c8b15754e58a4c7f8cd1071ec712 (diff) | |
Merge Fix V4l2 and DSI
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/omap/omap_vout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index bf02e84b564b..cfc1096af2a2 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c @@ -1166,10 +1166,10 @@ venc: vout->next_frm->state = VIDEOBUF_ACTIVE; addr = (unsigned long) vout->queued_buf_addr[vout->next_frm->i] + - vout->cropped_offset; + vout->cropped_offset[vout->next_frm->i]; uv_addr = (unsigned long)vout->queued_buf_uv_addr[ vout->next_frm->i] - + vout->cropped_uv_offset; + + vout->cropped_uv_offset[vout->next_frm->i]; /* First save the configuration in ovelray structure */ ret = omapvid_init(vout, addr, uv_addr); |