From c1bdc9300b3c0b05d49a8a0e34a5249dfe1544f3 Mon Sep 17 00:00:00 2001 From: Tomas Härdin Date: Thu, 10 Jun 2010 08:39:05 +0000 Subject: avcodec.h: Clarify AVCodecContext::pix_fmt documentation since its value may be set by the demuxer rawdec.c: Only perform bits_per_coded_sample -> pix_fmt guesswork if pix_fmt hasn't been set Originally committed as revision 23561 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/rawdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/rawdec.c') diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index ab13bdc59e..ce1febbf94 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -77,7 +77,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx) avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_mov, avctx->bits_per_coded_sample); else if (avctx->codec_tag) avctx->pix_fmt = find_pix_fmt(ff_raw_pix_fmt_tags, avctx->codec_tag); - else if (avctx->bits_per_coded_sample) + else if (avctx->pix_fmt == PIX_FMT_NONE && avctx->bits_per_coded_sample) avctx->pix_fmt = find_pix_fmt(pix_fmt_bps_avi, avctx->bits_per_coded_sample); context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); -- cgit v1.2.3