From e48fb4e1a5a9796b4fb0fee7212404517d236aa2 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 18 Apr 2014 01:01:38 +0200
Subject: ffmpeg: fix mixed merged & split side data with the stream->packet
 hack

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 ffmpeg.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ffmpeg.c')

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;
-- 
cgit v1.2.3