[FFmpeg-cvslog] r18381 - in trunk/libavcodec: mpeg12.c mpegvideo.c

[Baptiste Coudurier]

Hi Michael,

On 4/8/2009 1:48 PM, michael wrote:
> Author: michael
> Date: Wed Apr  8 22:48:44 2009
> New Revision: 18381
> 
> Log:
> Fix mb_height for interlaced mpeg2.
> This correctly fixes issue961, thanks to steven warren for spoting my
> mistake.
> 

Frist, thanks a lot for the fix.

> 
> Modified: trunk/libavcodec/mpegvideo.c
> ==============================================================================
> --- trunk/libavcodec/mpegvideo.c	Wed Apr  8 22:26:18 2009	(r18380)
> +++ trunk/libavcodec/mpegvideo.c	Wed Apr  8 22:48:44 2009	(r18381)
> @@ -444,6 +444,9 @@ av_cold int MPV_common_init(MpegEncConte
>  {
>      int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y, threads;
>  
> +    if(s->codec_id == CODEC_ID_MPEG2VIDEO && !s->progressive_sequence)
> +        s->mb_height = (s->height + 31) / 32 * 2;
> +    else
>      s->mb_height = (s->height + 15) / 16;
>  
>      if(s->avctx->pix_fmt == PIX_FMT_NONE){

Would you mind if I reindent the code ?

Also this apply to last commit for mpegvideo.h about this issue.
Is the fix still needed/wanted ?

-- 
Baptiste COUDURIER                              GnuPG Key Id: 0x5C1ABAAA
Key fingerprint                 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA
checking for life_signs in -lkenny... no
FFmpeg maintainer                                  http://www.ffmpeg.org