mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2025-03-03 10:17:46 +00:00
Set codec_id correctly for RJPG codec_tag
Originally committed as revision 10498 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
a135bea507
commit
efd7428666
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user