[SCM] libav/experimental: Fix timestamp association for mpeg2 field pictures. Fixes /MPlayer/incoming/codec_copy_fails_vob_to_mpeg-ts/codec_copy_fails_vob_to_mpeg-ts.vob

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit acbb378d1dd3e945d907743de221991d0ef11756
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Feb 21 23:22:51 2010 +0000

    Fix timestamp association for mpeg2 field pictures.
    Fixes /MPlayer/incoming/codec_copy_fails_vob_to_mpeg-ts/codec_copy_fails_vob_to_mpeg-ts.vob
    
    Originally committed as revision 21949 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 7eddabc..09bac2d 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -2204,7 +2204,7 @@ int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size,
                     return i-3;
                 }
             }
-            if(s && state == PICTURE_START_CODE){
+            if(pc->frame_start_found == 0 && s && state == PICTURE_START_CODE){
                 ff_fetch_timestamp(s, i-3, 1);
             }
         }

-- 
Libav/FFmpeg packaging