From 57e38043def65418333885c7481b197d470af336 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 18 May 2015 00:28:57 +0200 Subject: ffmpeg: Do not copy the display matrix if rotation meta-data is manually added Fixes Ticket4560 Signed-off-by: Michael Niedermayer --- ffmpeg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ffmpeg.c') diff --git a/ffmpeg.c b/ffmpeg.c index 6fe169a1a8..a89ae399bf 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -2757,9 +2757,13 @@ static int transcode_init(void) if (!ost->st->side_data) return AVERROR(ENOMEM); + ost->st->nb_side_data = 0; for (j = 0; j < ist->st->nb_side_data; j++) { const AVPacketSideData *sd_src = &ist->st->side_data[j]; - AVPacketSideData *sd_dst = &ost->st->side_data[j]; + AVPacketSideData *sd_dst = &ost->st->side_data[ost->st->nb_side_data]; + + if (ost->rotate_overridden && sd_src->type == AV_PKT_DATA_DISPLAYMATRIX) + continue; sd_dst->data = av_malloc(sd_src->size); if (!sd_dst->data) -- cgit v1.2.3