aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-28 23:34:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-03 03:40:58 +0200
commitd3bfb66a6665de9d89760b70411d53d10e0c7ba1 (patch)
tree291c6dbd00aecd83df09cf76617bbafdc7280cad
parent17a6ca7d3179f63f145bd08886c7252a77a1eeff (diff)
downloadffmpeg-d3bfb66a6665de9d89760b70411d53d10e0c7ba1.tar.gz
ffmpeg: Fix missing {} in Stream to Packet side data code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 31f9c228c042e7f0a017670e7eb18d9b27a71a10) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 1c1a5599d0..0dcdcfdff1 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);