[SCM] libav/experimental: fix exported motion vectors

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0c352cadb0eb63a39c852d0636490c905a8a1628
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Apr 18 17:46:52 2004 +0000

    fix exported motion vectors
    
    Originally committed as revision 3032 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 96355dd..e169224 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2334,7 +2334,7 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y,
                 for(dir=0; dir<2; dir++){
                     if (s->mb_intra || (dir==1 && s->pict_type != B_TYPE)) {
                         motion_x = motion_y = 0;
-                    }else if (s->mv_type == MV_TYPE_16X16){
+                    }else if (s->mv_type == MV_TYPE_16X16 || (s->mv_type == MV_TYPE_FIELD && field_pic)){
                         motion_x = s->mv[dir][0][0];
                         motion_y = s->mv[dir][0][1];
                     } else /*if ((s->mv_type == MV_TYPE_FIELD) || (s->mv_type == MV_TYPE_16X8))*/ {

-- 
Libav/FFmpeg packaging