lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 18 Mar 2015 19:35:26 +0000 (20:35 +0100)
committerCarl Eugen Hoyos <cehoyos@ag.or.at>
Wed, 18 Mar 2015 19:35:26 +0000 (20:35 +0100)
This change allows remuxing hevc from mpeg-ts to Matroska.

libavformat/matroskaenc.c

index be4d689..40f903b 100644 (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,