Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:37:41 +0000 (22:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:37:41 +0000 (22:37 +0200)
* commit 'f7e932473314e6ca4c851d49cbde8570b6e66383':
  audiointerleave: Always initialize new_pkt

Conflicts:
libavformat/audiointerleave.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/audiointerleave.c

@@@ -132,13 -127,10 +132,13 @@@ int ff_audio_rechunk_interleave(AVForma
      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 (interleave_new_audio_packet(s, &new_pkt, i, flush))
 +            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;
 +            }
 +            if (ret < 0)
 +                return ret;
          }
      }