highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

matroska: use av_stream_add_side_data() for stereo3d side data

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
James Almer
2016-11-22 15:50:28 -05:00
committed by Vittorio Giovara
parent 1893495e1d
commit 12ab667e21
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavformat/matroska.c
View File

@@ -115,26 +115,13 @@ const AVMetadataConv ff_mkv_metadata_conv[] = {
int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode) int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode)
{ {
AVPacketSideData *sd, *tmp;
AVStereo3D *stereo; AVStereo3D *stereo;
int ret;
stereo = av_stereo3d_alloc(); stereo = av_stereo3d_alloc();
if (!stereo) if (!stereo)
return AVERROR(ENOMEM); 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 // note: the missing breaks are intentional
switch (stereo_mode) { switch (stereo_mode) {
case MATROSKA_VIDEO_STEREOMODE_TYPE_MONO: case MATROSKA_VIDEO_STEREOMODE_TYPE_MONO:
@@ -172,5 +159,12 @@ int ff_mkv_stereo3d_conv(AVStream *st, MatroskaVideoStereoModeType stereo_mode)
break; 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; return 0;
} }