-
Michael Niedermayer authored
* commit '1967cd4e': audiointerleave: check av_new_packet return value Conflicts: libavformat/audiointerleave.c See: 3ca8a232Merged-by: Michael Niedermayer <michaelni@gmx.at>
6d2a2bfb
* commit '1967cd4e': audiointerleave: check av_new_packet return value Conflicts: libavformat/audiointerleave.c See: 3ca8a232Merged-by: Michael Niedermayer <michaelni@gmx.at>