[FFmpeg-cvslog] r20626 - in trunk: libavcodec/motionpixels.c libavformat/mvi.c

[reimar]

Author: reimar
Date: Thu Nov 26 22:15:06 2009
New Revision: 20626

Log:
10l, pix_fmt should be set by the motionpixels decoder, not by the demuxer.
This fixes playback when lavf and lavc are less tightly couples as in e.g. MPlayer.

Modified:
   trunk/libavcodec/motionpixels.c
   trunk/libavformat/mvi.c

Modified: trunk/libavcodec/motionpixels.c
==============================================================================
--- trunk/libavcodec/motionpixels.c	Thu Nov 26 22:04:33 2009	(r20625)
+++ trunk/libavcodec/motionpixels.c	Thu Nov 26 22:15:06 2009	(r20626)
@@ -112,6 +112,7 @@ static av_cold int mp_decode_init(AVCode
     mp->offset_bits_len = av_log2(avctx->width * avctx->height) + 1;
     mp->vpt = av_mallocz(avctx->height * sizeof(YuvPixel));
     mp->hpt = av_mallocz(avctx->height * avctx->width / 16 * sizeof(YuvPixel));
+    avctx->pix_fmt = PIX_FMT_RGB555;
     return 0;
 }
 

Modified: trunk/libavformat/mvi.c
==============================================================================
--- trunk/libavformat/mvi.c	Thu Nov 26 22:04:33 2009	(r20625)
+++ trunk/libavformat/mvi.c	Thu Nov 26 22:15:06 2009	(r20626)
@@ -86,7 +86,6 @@ static int read_header(AVFormatContext *
     av_set_pts_info(vst, 64, msecs_per_frame, 1000000);
     vst->codec->codec_type = CODEC_TYPE_VIDEO;
     vst->codec->codec_id   = CODEC_ID_MOTIONPIXELS;
-    vst->codec->pix_fmt    = PIX_FMT_RGB555;
 
     mvi->get_int = (vst->codec->width * vst->codec->height < (1 << 16)) ? get_le16 : get_le24;