[FFmpeg-cvslog] ffmpeg: fix mixed merged & split side data with the stream->packet hack

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 18 01:01:38 2014 +0200| [e48fb4e1a5a9796b4fb0fee7212404517d236aa2] | committer: Michael Niedermayer

ffmpeg: fix mixed merged & split side data with the stream->packet hack

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e48fb4e1a5a9796b4fb0fee7212404517d236aa2
---

 ffmpeg.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 051e279..c97f462 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;