[FFmpeg-cvslog] Merge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 25 03:27:13 2014 +0200| [6d2a2bfb59f849fadc82374aa8463ac34444ba82] | committer: Michael Niedermayer

Merge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d'

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

Conflicts:
	libavformat/audiointerleave.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d2a2bfb59f849fadc82374aa8463ac34444ba82
---