har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mov: use av_stream_add_side_data() for displaymatrix side data

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2016-11-17 02:19:19 -03:00
parent 2ab50647ff
commit 77f033eb98
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/mov.c
View File

@ -5647,20 +5647,13 @@ static int mov_read_header(AVFormatContext *s)
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
if (sc->display_matrix) { if (sc->display_matrix) {
AVPacketSideData *sd, *tmp; int ret;
tmp = av_realloc_array(st->side_data, ret = av_stream_add_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, (uint8_t*)sc->display_matrix,
st->nb_side_data + 1, sizeof(*tmp)); sizeof(int32_t) * 9);
if (!tmp) if (ret < 0)
return AVERROR(ENOMEM); return ret;
st->side_data = tmp;
st->nb_side_data++;
sd = &st->side_data[st->nb_side_data - 1];
sd->type = AV_PKT_DATA_DISPLAYMATRIX;
sd->size = sizeof(int32_t) * 9;
sd->data = (uint8_t*)sc->display_matrix;
sc->display_matrix = NULL; sc->display_matrix = NULL;
} }
break; break;