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

avformat/avidec: recognize H265 fourcc as hevc 

Fixes decoding of came2_2020-01-13__20-38-58_21-00-00__Chn2.avi
This commit is contained in:
Paul B Mahol 2020-03-06 21:16:49 +01:00
parent f0349df7c7
commit d4d74707fb
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/avidec.c
View File

@ -832,6 +832,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
st->need_parsing = AVSTREAM_PARSE_FULL;
if (st->codecpar->codec_id == AV_CODEC_ID_RV40)
st->need_parsing = AVSTREAM_PARSE_NONE;
if (st->codecpar->codec_id == AV_CODEC_ID_HEVC &&
st->codecpar->codec_tag == MKTAG('H', '2', '6', '5'))
st->need_parsing = AVSTREAM_PARSE_FULL;
if (st->codecpar->codec_tag == 0 && st->codecpar->height > 0 &&
st->codecpar->extradata_size < 1U << 30) {

1
libavformat/riff.c
View File

@ -497,6 +497,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
const AVCodecTag ff_codec_bmp_tags_unofficial[] = {
{ AV_CODEC_ID_HEVC, MKTAG('H', 'E', 'V', 'C') },
{ AV_CODEC_ID_HEVC, MKTAG('H', '2', '6', '5') },
{ AV_CODEC_ID_NONE, 0 }
};