diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-03-18 20:35:26 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2015-03-18 20:35:26 +0100 |
| commit | 7a5356c7281d39ee168bfa984ae081969e47da27 (patch) | |
| tree | 6c68f9ad4e3cd6b370ffad14c92c5e74d3413e2f | |
| parent | 7f1ea38868e9d1e4f9814cc34ce7d50e38aa93fc (diff) | |
| download | ffmpeg-7a5356c7281d39ee168bfa984ae081969e47da27.tar.gz | |
lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
This change allows remuxing hevc from mpeg-ts to Matroska.
| -rw-r--r-- | libavformat/matroskaenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index be4d689bfe..40f903b68f 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -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, |