diff options
| author | James Almer <jamrial@gmail.com> | 2016-11-17 02:19:38 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-11-19 12:20:50 -0300 |
| commit | 2343f23e4d7e0d0f6adfd83d7d769a7a115dbd17 (patch) | |
| tree | 643430d3e99358d3ac625fdd56b54f62a5624f99 /libavformat/matroska.c | |
| parent | eb3a59c903bd9e7547061c23d9559c130421e7b0 (diff) | |
avformat/matroska: use av_stream_add_side_data() for stereo3d side data
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/matroska.c')
| -rw-r--r-- | libavformat/matroska.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/libavformat/matroska.c b/libavformat/matroska.c index c592fb0ce3..f3e1be796d 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -150,26 +150,13 @@ const char * const ff_matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_CO 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: @@ -207,5 +194,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; } |