[FFmpeg-devel] [RFC]Ignore ff_isom_write_hvcc() return value writing mkv like the mov muxer does

[Carl Eugen Hoyos]

Hi!

Attached poc fixes remuxing hevc from mpegts to mkv.
The mov muxer writes an empty hvcC atom in this case.

What has to be done?

Carl Eugen

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index c781c8a..e3fe4fa 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -602,8 +602,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,
+        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,

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel