[FFmpeg-cvslog] vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()

Michael Niedermayer git at videolan.org
Wed May 15 20:21:21 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 24 14:59:49 2013 +0200| [201412ffec044bb064734edb699e91152f7b53b2] | committer: Martin Storsjö

vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma()

Signed-off-by: Martin Storsjö <martin at martin.st>

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

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

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index b13e91f..f56f074 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -829,14 +829,9 @@ static void vc1_mc_4mv_chroma(VC1Context *v, int dir)
     }
 
     if (!dir) {
-        if (v->field_mode) {
-            if ((v->cur_field_type != chroma_ref_type) && v->cur_field_type) {
-                srcU = s->current_picture.f.data[1];
-                srcV = s->current_picture.f.data[2];
-            } else {
-                srcU = s->last_picture.f.data[1];
-                srcV = s->last_picture.f.data[2];
-            }
+        if (v->field_mode && (v->cur_field_type != chroma_ref_type) && v->cur_field_type) {
+            srcU = s->current_picture.f.data[1];
+            srcV = s->current_picture.f.data[2];
         } else {
             srcU = s->last_picture.f.data[1];
             srcV = s->last_picture.f.data[2];



More information about the ffmpeg-cvslog mailing list