Commit 7e532dd7 authored by michael's avatar michael

Make sure mpeg2 has its height rounded up to 32 as that is needed

for iterlaced stuff.
This might have been exploitable when emu edge was not set though
note this bug has been introduced just a few days ago.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18405 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent a273e205
...@@ -144,6 +144,8 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){ ...@@ -144,6 +144,8 @@ void avcodec_align_dimensions(AVCodecContext *s, int *width, int *height){
case PIX_FMT_YUVA420P: case PIX_FMT_YUVA420P:
w_align= 16; //FIXME check for non mpeg style codecs and use less alignment w_align= 16; //FIXME check for non mpeg style codecs and use less alignment
h_align= 16; h_align= 16;
if(s->codec_id == CODEC_ID_MPEG2VIDEO)
h_align= 32; // interlaced is rounded up to 2 MBs
break; break;
case PIX_FMT_YUV411P: case PIX_FMT_YUV411P:
case PIX_FMT_UYYVYY411: case PIX_FMT_UYYVYY411:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment