Commit efd74286 authored by Reimar Döffinger's avatar Reimar Döffinger

Set codec_id correctly for RJPG codec_tag

Originally committed as revision 10498 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a135bea5
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment