Mercurial > libavcodec.hg
comparison mpegvideo_common.h @ 10014:f2fa6cbb01ce libavcodec
Revert r18344. Fixes at least issue 1218, 1221, and 1187), see master
issue 1221 for details.
Briefly, out of bounds field mvs in field pictures would cause a crash.
| author | heydowns |
|---|---|
| date | Mon, 03 Aug 2009 17:54:11 +0000 |
| parents | 1ff6eb1d7d14 |
| children | 71ff4286b0d0 |
comparison
equal
deleted
inserted
replaced
| 10013:454cb6aa43a3 | 10014:f2fa6cbb01ce |
|---|---|
| 313 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){ | 313 || (unsigned)src_y > v_edge_pos - (motion_y&1) - h){ |
| 314 if(is_mpeg12 || s->codec_id == CODEC_ID_MPEG2VIDEO || | 314 if(is_mpeg12 || s->codec_id == CODEC_ID_MPEG2VIDEO || |
| 315 s->codec_id == CODEC_ID_MPEG1VIDEO){ | 315 s->codec_id == CODEC_ID_MPEG1VIDEO){ |
| 316 av_log(s->avctx,AV_LOG_DEBUG, | 316 av_log(s->avctx,AV_LOG_DEBUG, |
| 317 "MPEG motion vector out of boundary\n"); | 317 "MPEG motion vector out of boundary\n"); |
| 318 if(!s->chroma_y_shift) | |
| 319 return; | 318 return; |
| 320 } | 319 } |
| 321 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, | 320 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, |
| 322 17, 17+field_based, | 321 17, 17+field_based, |
| 323 src_x, src_y<<field_based, | 322 src_x, src_y<<field_based, |