Revert r18344. Fixes at least issue 1218, 1221, and 1187), see master
authorJeff Downs <heydowns@borg.com>
Mon, 3 Aug 2009 17:54:11 +0000 (17:54 +0000)
committerJeff Downs <heydowns@borg.com>
Mon, 3 Aug 2009 17:54:11 +0000 (17:54 +0000)
issue 1221 for details.
Briefly, out of bounds field mvs in field pictures would cause a crash.

Originally committed as revision 19575 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/mpegvideo_common.h

index 45b84e0..7c8ba13 100644 (file)
@@ -315,7 +315,6 @@ if(s->quarter_sample)
                s->codec_id == CODEC_ID_MPEG1VIDEO){
                 av_log(s->avctx,AV_LOG_DEBUG,
                         "MPEG motion vector out of boundary\n");
                s->codec_id == CODEC_ID_MPEG1VIDEO){
                 av_log(s->avctx,AV_LOG_DEBUG,
                         "MPEG motion vector out of boundary\n");
-                if(!s->chroma_y_shift)
                     return;
             }
             ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize,
                     return;
             }
             ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize,