[FFmpeg-cvslog] lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does.

Carl Eugen Hoyos git at videolan.org
Wed Mar 18 21:39:04 CET 2015


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Wed Mar 18 20:35:26 2015 +0100| [7a5356c7281d39ee168bfa984ae081969e47da27] | committer: Carl Eugen Hoyos

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

This change allows remuxing hevc from mpeg-ts to Matroska.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a5356c7281d39ee168bfa984ae081969e47da27
---

 libavformat/matroskaenc.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index be4d689..40f903b 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,



More information about the ffmpeg-cvslog mailing list