Michael Niedermayer d1f7b313ac Merge commit 'f7e932473314e6ca4c851d49cbde8570b6e66383' ...

* commit 'f7e932473314e6ca4c851d49cbde8570b6e66383':
  audiointerleave: Always initialize new_pkt

Conflicts:
	libavformat/audiointerleave.c

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

2015-06-08 22:37:41 +02:00

4.9 KiB

Raw Blame History

View Raw