[libav-commits] matroska: use av_stream_add_side_data() for stereo3d side data

James Almer git at libav.org
Wed Nov 23 17:01:52 CET 2016


Module: libav
Branch: master
Commit: 12ab667e219e7fbf8e9aef3731039b75c822df25

Author:    James Almer <jamrial at gmail.com>
Committer: Vittorio Giovara <vittorio.giovara at gmail.com>
Date:      Tue Nov 22 15:50:28 2016 -0500

matroska: use av_stream_add_side_data() for stereo3d side data

Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>

---

 libavformat/matroska.c |   22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index 8842d7c..a8f5e98 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -115,26 +115,13 @@ const AVMetadataConv ff_mkv_metadata_conv[] = {
 
 int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode)
 {
-    AVPacketSideData *sd, *tmp;
     AVStereo3D *stereo;
+    int ret;
 
     stereo = av_stereo3d_alloc();
     if (!stereo)
         return AVERROR(ENOMEM);
 
-    tmp = av_realloc_array(st->side_data, st->nb_side_data + 1, sizeof(*tmp));
-    if (!tmp) {
-        av_freep(&stereo);
-        return AVERROR(ENOMEM);
-    }
-    st->side_data = tmp;
-    st->nb_side_data++;
-
-    sd = &st->side_data[st->nb_side_data - 1];
-    sd->type = AV_PKT_DATA_STEREO3D;
-    sd->data = (uint8_t *)stereo;
-    sd->size = sizeof(*stereo);
-
     // note: the missing breaks are intentional
     switch (stereo_mode) {
     case MATROSKA_VIDEO_STEREOMODE_TYPE_MONO:
@@ -172,5 +159,12 @@ int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode)
         break;
     }
 
+    ret = av_stream_add_side_data(st, AV_PKT_DATA_STEREO3D, (uint8_t *)stereo,
+                                  sizeof(*stereo));
+    if (ret < 0) {
+        av_freep(&stereo);
+        return ret;
+    }
+
     return 0;
 }



More information about the libav-commits mailing list