[FFmpeg-cvslog] vc1dec: fix lutuv use in vc1_mc_4mv_chroma4()

Michael Niedermayer git at videolan.org
Fri May 3 18:21:21 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May  3 18:09:15 2013 +0200| [d29f9f4a0e0af4929c13c8457c1cf68dc02a6c58] | committer: Michael Niedermayer

vc1dec: fix lutuv use in vc1_mc_4mv_chroma4()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d29f9f4a0e0af4929c13c8457c1cf68dc02a6c58
---

 libavcodec/vc1dec.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 8edf731..613241c 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -1041,14 +1041,14 @@ static void vc1_mc_4mv_chroma4(VC1Context *v, int dir, int dir2, int avg)
             if (use_ic) {
                 int i, j;
                 uint8_t *src, *src2;
-                const uint8_t *lutuv1 = lutuv[v->ref_field_type[i<2 ? dir : dir2]];
 
                 src  = srcU;
                 src2 = srcV;
                 for (j = 0; j < 5; j++) {
+                    int f = (uvsrc_y + (j<<fieldmv))&1;
                     for (i = 0; i < 5; i++) {
-                        src[i]  = lutuv1[src[i]];
-                        src2[i] = lutuv1[src2[i]];
+                        src[i]  = lutuv[f][src[i]];
+                        src2[i] = lutuv[f][src2[i]];
                     }
                     src  += s->uvlinesize << fieldmv;
                     src2 += s->uvlinesize << fieldmv;



More information about the ffmpeg-cvslog mailing list