From 0bbabd55708c258cb1876ef0377d0d320b7b9c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= Date: Fri, 11 Feb 2011 13:29:59 +0100 Subject: [PATCH] --- yaml --- r: 235983 b: refs/heads/master c: 856e22d3cd3c38399be796b80bcf57769eefeee3 h: refs/heads/master i: 235981: c69c52af4be07c465b9f8d2214a9209abdf60772 235979: 87f53c6394c97837d4fd883a0b7c90e3f60f5b9a 235975: 6d21d875c1a78aaa66b12a062b6e6044cf8cb061 235967: 10e4edc3864e9c22bfb4455431d9dfddf20700cc v: v3 --- [refs] | 2 +- trunk/drivers/staging/solo6x10/solo6010-enc.c | 1 - trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4f4b9efbe167..6e2cec36b9f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c55564fdf793797dd2740a67c35a2cedc133c9ff +refs/heads/master: 856e22d3cd3c38399be796b80bcf57769eefeee3 diff --git a/trunk/drivers/staging/solo6x10/solo6010-enc.c b/trunk/drivers/staging/solo6x10/solo6010-enc.c index 481a49277f77..7e28f7dbbbdd 100644 --- a/trunk/drivers/staging/solo6x10/solo6010-enc.c +++ b/trunk/drivers/staging/solo6x10/solo6010-enc.c @@ -176,7 +176,6 @@ static void solo_mp4e_config(struct solo6010_dev *solo_dev) SOLO_VE_BLOCK_BASE(SOLO_MP4E_EXT_ADDR(solo_dev) >> 16)); solo_reg_write(solo_dev, SOLO_VE_CFG1, - SOLO_VE_BYTE_ALIGN(2) | SOLO_VE_INSERT_INDEX | SOLO_VE_MOTION_MODE(0)); solo_reg_write(solo_dev, SOLO_VE_WMRK_POLY, 0); diff --git a/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c b/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c index 83d89318f94a..b504d594c3af 100644 --- a/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c +++ b/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c @@ -754,7 +754,7 @@ void solo_enc_v4l2_isr(struct solo6010_dev *solo_dev) cur_q = ((solo_reg_read(solo_dev, SOLO_VE_STATE(11)) & 0xF) + 1) % MP4_QS; - reg_mpeg_size = ((solo_reg_read(solo_dev, SOLO_VE_STATE(0)) & 0xFFFFF) + 64 + 32) & ~31; + reg_mpeg_size = ((solo_reg_read(solo_dev, SOLO_VE_STATE(0)) & 0xFFFFF) + 64 + 8) & ~7; while (solo_dev->enc_idx != cur_q) { mpeg_current = solo_reg_read(solo_dev,