summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-11-26 21:15:06 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-11-26 21:15:06 +0000
commit7c7d3abf3c64c84b2e096b0e74da4fa9a758d53d (patch)
tree7967f67a0f4637e7825f6023d49fad29035b13e8 /libavformat
parenta9af75ae850d54cb4a03ce29a0f59c34b4f8f9ce (diff)
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. Originally committed as revision 20626 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mvi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mvi.c b/libavformat/mvi.c
index 2dc4667a68..89c47da473 100644
--- a/libavformat/mvi.c
+++ b/libavformat/mvi.c
@@ -86,7 +86,6 @@ static int read_header(AVFormatContext *s, AVFormatParameters *ap)
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;