Merge commit 'f7e93247'

* commit 'f7e93247':
  audiointerleave: Always initialize new_pkt

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

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;