Michael Niedermayer 6d2a2bfb59 Merge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d' ...

* commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d':
  audiointerleave: check av_new_packet return value

Conflicts:
	libavformat/audiointerleave.c

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

2014-10-25 03:27:13 +02:00

4.9 KiB

Raw Blame History

View Raw