avformat/matroskaenc: Use av_stream_get_side_data() instead of loop

in mkv_write_stereo_mode(). Also check the size of the AVStereo3D
side data.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index df3ba6ceed15a24827c0d8708a4e7f54dfb31b39..7a6a2998739854485ad4fd66173c46fe7627e357 100644 (file)
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1029,6 +1029,8 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb,
     int ret = 0;
     const AVDictionaryEntry *tag;
     MatroskaVideoStereoModeType format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB;
+    const AVStereo3D *stereo;
+    int side_data_size = 0;
 
     *h_width = 1;
     *h_height = 1;
@@ -1051,12 +1053,9 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb,
         }
     }
 
-    // iterate to find the stereo3d side data
-    for (i = 0; i < st->nb_side_data; i++) {
-        AVPacketSideData sd = st->side_data[i];
-        if (sd.type == AV_PKT_DATA_STEREO3D) {
-            AVStereo3D *stereo = (AVStereo3D *)sd.data;
-
+    stereo = (const AVStereo3D*)av_stream_get_side_data(st, AV_PKT_DATA_STEREO3D,
+                                                        &side_data_size);
+    if (side_data_size >= sizeof(AVStereo3D)) {
             switch (stereo->type) {
             case AV_STEREO3D_2D:
                 format = MATROSKA_VIDEO_STEREOMODE_TYPE_MONO;
@@ -1096,8 +1095,6 @@ static int mkv_write_stereo_mode(AVFormatContext *s, AVIOContext *pb,
                     format++;
                 break;
             }
-            break;
-        }
     }
 
     if (format == MATROSKA_VIDEO_STEREOMODE_TYPE_NB)