RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Reimar Döffinger 2009-11-26 21:15:06 +00:00
parent a9af75ae85
commit 7c7d3abf3c
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/motionpixels.c
View File

@ -112,6 +112,7 @@ static av_cold int mp_decode_init(AVCodecContext *avctx)
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;
}

1
libavformat/mvi.c
View File

@ -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;