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)
commitd1f7b313ac3476e4b00f550e470f9f8429919299
tree3d24a2319f6ed857de556a84249ee6730cd18275
parent01a6ae1396b5c96d23da40fe082d0f510fcab388
parentf7e932473314e6ca4c851d49cbde8570b6e66383
Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383'

* commit 'f7e932473314e6ca4c851d49cbde8570b6e66383':
  audiointerleave: Always initialize new_pkt

Conflicts:
libavformat/audiointerleave.c

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