[FFmpeg-cvslog] Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  8 22:37:41 2015 +0200| [d1f7b313ac3476e4b00f550e470f9f8429919299] | committer: Michael Niedermayer

Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'

* commit 'f7e932473314e6ca4c851d49cbde8570b6e66383':
  audiointerleave: Always initialize new_pkt

Conflicts:
	libavformat/audiointerleave.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d1f7b313ac3476e4b00f550e470f9f8429919299
---