[MPlayer-dev-eng] [MPlayer-cvslog] r23327 - in trunk: libmpcodecs/ve_lavc.c libmpdemux/muxer_lavf.c

[Corey Hickey]

corey wrote:
> Author: corey
> Date: Thu May 17 02:16:51 2007
> New Revision: 23327
> 
> Log:
> Pass imgfmt from lavc encoder to lavf muxer (this is needed for dv).

[cut]

> Modified: trunk/libmpdemux/muxer_lavf.c
> ==============================================================================
> --- trunk/libmpdemux/muxer_lavf.c	(original)
> +++ trunk/libmpdemux/muxer_lavf.c	Thu May 17 02:16:51 2007
> @@ -240,6 +240,7 @@ static void fix_parameters(muxer_stream_
>                  if(ctx->codec_id <= 0 || force_fourcc)
>                      ctx->codec_tag= stream->bih->biCompression;
>  		mp_msg(MSGT_MUXER, MSGL_INFO, "VIDEO CODEC ID: %d\n", ctx->codec_id);
> +		ctx->pix_fmt = imgfmt2pixfmt(stream->imgfmt);
>  		ctx->width = stream->bih->biWidth;
>  		ctx->height = stream->bih->biHeight;
>  		ctx->bit_rate = 800000;

I just realized that this chunk is bad for encoding with a non-lavc 
encoder--PIX_FMT_NONE is -1, not 0, so if stream->imgfmt is 0, 
ctx->pix_fmt gets set incorrectly to PIX_FMT_YUV420P.

Is this patch ok?

If nobody cares, I'll apply it tomorrow. After that, I'll fix the 
indentation in a separate patch.

-Corey
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: imgfmt_nospam.diff
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20070516/bfc5bd4c/attachment.txt>