Commit d1f7b313 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f7e93247'

* commit 'f7e93247':
  audiointerleave: Always initialize new_pkt

Conflicts:
	libavformat/audiointerleave.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 01a6ae13 f7e93247
...@@ -132,7 +132,7 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt ...@@ -132,7 +132,7 @@ int ff_audio_rechunk_interleave(AVFormatContext *s, AVPacket *out, AVPacket *pkt
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO) { 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) { while ((ret = interleave_new_audio_packet(s, &new_pkt, i, flush)) > 0) {
if ((ret = ff_interleave_add_packet(s, &new_pkt, compare_ts)) < 0) if ((ret = ff_interleave_add_packet(s, &new_pkt, compare_ts)) < 0)
return ret; return ret;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment