diff options
| author | James Almer <jamrial@gmail.com> | 2016-11-17 02:19:19 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-11-18 22:20:36 -0300 |
| commit | 77f033eb98d0d7d05f3aa238409d87fb1f6096b3 (patch) | |
| tree | 085916f66445dcc4d71a154698da5c00bdfffbbb /libavformat/mov.c | |
| parent | 2ab50647ff653ab45d9d78203b6a671124609991 (diff) | |
| download | ffmpeg-77f033eb98d0d7d05f3aa238409d87fb1f6096b3.tar.gz | |
avformat/mov: use av_stream_add_side_data() for displaymatrix side data
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 8d6cc12bac..9bf436e261 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -5647,20 +5647,13 @@ static int mov_read_header(AVFormatContext *s) break; case AVMEDIA_TYPE_VIDEO: if (sc->display_matrix) { - AVPacketSideData *sd, *tmp; + int ret; - tmp = av_realloc_array(st->side_data, - st->nb_side_data + 1, sizeof(*tmp)); - if (!tmp) - return AVERROR(ENOMEM); - - st->side_data = tmp; - st->nb_side_data++; + ret = av_stream_add_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, (uint8_t*)sc->display_matrix, + sizeof(int32_t) * 9); + if (ret < 0) + return ret; - 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; } break; |