-
Michael Niedermayer authored
* commit '7c710c38': audiointerleave: check av_new_packet return value Conflicts: libavformat/audiointerleave.c See: 3ca8a232Merged-by:
Michael Niedermayer <michaelni@gmx.at>
298f7f1f
* commit '7c710c38': audiointerleave: check av_new_packet return value Conflicts: libavformat/audiointerleave.c See: 3ca8a232Merged-by:Michael Niedermayer <michaelni@gmx.at>