-
Michael Niedermayer authored
* commit 'f7e93247': audiointerleave: Always initialize new_pkt Conflicts: libavformat/audiointerleave.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
d1f7b313
* commit 'f7e93247': audiointerleave: Always initialize new_pkt Conflicts: libavformat/audiointerleave.c Merged-by: Michael Niedermayer <michaelni@gmx.at>