summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2017-05-29 13:55:28 +0200
committerLuca Barbato <lu_zero@gentoo.org>2017-05-31 12:51:55 +0200
commit91622f6446b463abe6507ad2cd5d1fbf7e49c424 (patch)
tree4ca7c12fdf126b439776eb027c0dfad444e55ea3
parent427f7a1f9ec1977bcb57cb4d6e6f7228dc1e858b (diff)
avconv: Always initialize the opkt struct on streamcopy
-rw-r--r--avtools/avconv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/avtools/avconv.c b/avtools/avconv.c
index 719d289ff9..8dd11bb5fc 100644
--- a/avtools/avconv.c
+++ b/avtools/avconv.c
@@ -1125,7 +1125,9 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
InputFile *f = input_files [ist->file_index];
int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->mux_timebase);
- AVPacket opkt;
+ AVPacket opkt = { 0 };
+
+ av_init_packet(&opkt);
// EOF: flush output bitstream filters.
if (!pkt) {
@@ -1133,8 +1135,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
return;
}
- av_init_packet(&opkt);
-
if ((!ost->frame_number && !(pkt->flags & AV_PKT_FLAG_KEY)) &&
!ost->copy_initial_nonkeyframes)
return;