[FFmpeg-cvslog] ffmpeg: Fix missing {} in Stream to Packet side data code

Michael Niedermayer git at videolan.org
Fri Oct 3 03:47:44 CEST 2014


ffmpeg | branch: release/2.3 | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 28 23:34:20 2014 +0200| [d3bfb66a6665de9d89760b70411d53d10e0c7ba1] | committer: Michael Niedermayer

ffmpeg: Fix missing {} in Stream to Packet side data code

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 31f9c228c042e7f0a017670e7eb18d9b27a71a10)

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

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

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

diff --git a/ffmpeg.c b/ffmpeg.c
index 1c1a559..0dcdcfd 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3419,7 +3419,7 @@ static int process_input(int file_index)
     }
 
     /* add the stream-global side data to the first packet */
-    if (ist->nb_packets == 1)
+    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++) {
@@ -3435,6 +3435,7 @@ static int process_input(int file_index)
 
             memcpy(dst_data, src_sd->data, src_sd->size);
         }
+    }
 
     if (pkt.dts != AV_NOPTS_VALUE)
         pkt.dts += av_rescale_q(ifile->ts_offset, AV_TIME_BASE_Q, ist->st->time_base);



More information about the ffmpeg-cvslog mailing list