From efd74286662a6887bdbc0f590b17a9f5a6dc913b Mon Sep 17 00:00:00 2001 From: Reimar Döffinger Date: Sat, 15 Sep 2007 08:19:01 +0000 Subject: Set codec_id correctly for RJPG codec_tag Originally committed as revision 10498 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/nuv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 152ef671d3..fe637de6b2 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -85,6 +85,8 @@ static int get_codec_data(ByteIOContext *pb, AVStream *vst, vst->codec->codec_tag = get_le32(pb); vst->codec->codec_id = codec_get_id(codec_bmp_tags, vst->codec->codec_tag); + if (vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G')) + vst->codec->codec_id = CODEC_ID_NUV; } else url_fskip(pb, 4); @@ -174,7 +176,6 @@ static int nuv_header(AVFormatContext *s, AVFormatParameters *ap) { get_codec_data(pb, vst, ast, is_mythtv); ctx->rtjpg_video = vst->codec->codec_id == CODEC_ID_NUV; - ctx->rtjpg_video |= vst->codec->codec_tag == MKTAG('R', 'J', 'P', 'G'); return 0; } -- cgit v1.2.3