Merge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 01:27:13 +0000 (03:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 25 Oct 2014 01:27:13 +0000 (03:27 +0200)
* commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d':
  audiointerleave: check av_new_packet return value

Conflicts:
libavformat/audiointerleave.c

See: 3ca8a2328878ebdb203e49d0a060df1b5337a370
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/audiointerleave.c

Simple merge