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

lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does. 

This change allows remuxing hevc from mpeg-ts to Matroska.
This commit is contained in:
Carl Eugen Hoyos 2015-03-18 20:35:26 +01:00
parent 7f1ea38868
commit 7a5356c728
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/matroskaenc.c
View File

@ -605,8 +605,9 @@ static int mkv_write_native_codecprivate(AVFormatContext *s,
return ff_isom_write_avcc(dyn_cp, codec->extradata,
codec->extradata_size);
case AV_CODEC_ID_HEVC:
return ff_isom_write_hvcc(dyn_cp, codec->extradata,
codec->extradata_size, 0);
ff_isom_write_hvcc(dyn_cp, codec->extradata,
codec->extradata_size, 0);
return 0;
case AV_CODEC_ID_ALAC:
if (codec->extradata_size < 36) {
av_log(s, AV_LOG_ERROR,