aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-18 01:01:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-18 01:01:38 +0200
commite48fb4e1a5a9796b4fb0fee7212404517d236aa2 (patch)
tree629a3e767008159e314f008224d697f36589e818
parentcdc166acd80bf7de7338ac95b3f283dd531a9a06 (diff)
downloadffmpeg-e48fb4e1a5a9796b4fb0fee7212404517d236aa2.tar.gz
ffmpeg: fix mixed merged & split side data with the stream->packet hack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 051e279763..c97f46285e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3323,6 +3323,8 @@ static int process_input(int file_index)
/* add the stream-global side data to the first packet */
if (ist->nb_packets == 1)
+ if (ist->st->nb_side_data)
+ av_packet_split_side_data(&pkt);
for (i = 0; i < ist->st->nb_side_data; i++) {
AVPacketSideData *src_sd = &ist->st->side_data[i];
uint8_t *dst_data;