diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:37:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-08 22:37:41 +0200 |
| commit | d1f7b313ac3476e4b00f550e470f9f8429919299 (patch) | |
| tree | 3d24a2319f6ed857de556a84249ee6730cd18275 | |
| parent | 01a6ae1396b5c96d23da40fe082d0f510fcab388 (diff) | |
| parent | f7e932473314e6ca4c851d49cbde8570b6e66383 (diff) | |
| download | ffmpeg-d1f7b313ac3476e4b00f550e470f9f8429919299.tar.gz | |
Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'
* commit 'f7e932473314e6ca4c851d49cbde8570b6e66383':
audiointerleave: Always initialize new_pkt
Conflicts:
libavformat/audiointerleave.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/audiointerleave.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/audiointerleave.c b/libavformat/audiointerleave.c index b64010ff44..6d1401d721 100644 --- a/libavformat/audiointerleave.c +++ b/libavformat/audiointerleave.c @@ -132,7 +132,7 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { - AVPacket new_pkt; + AVPacket new_pkt = { 0 }; while ((ret = interleave_new_audio_packet(s, &new_pkt, i, flush)) > 0) { if ((ret = ff_interleave_add_packet(s, &new_pkt, compare_ts)) < 0) return ret; |