ffmpeg: fix mixed merged & split side data with the stream->packet hack
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 23:01:38 +0000 (01:01 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 17 Apr 2014 23:01:38 +0000 (01:01 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c

index 051e279..c97f462 100644 (file)
--- 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;