[FFmpeg-cvslog] Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 17 14:18:20 2014 +0200| [e5cb7795fcafdf6bad58ba35161527b4a03b1122] | committer: Michael Niedermayer

Merge commit '324ff59444ff5470bb325ff1e2be7c4b054fc944'

* commit '324ff59444ff5470bb325ff1e2be7c4b054fc944':
  avpacket: Check for and return errors in ff_interleave_add_packet()

Conflicts:
	libavformat/audiointerleave.c
	libavformat/internal.h
	libavformat/mux.c

See: 4d7c71c36467331f1e0c0f17af9f371d33308a9c
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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