[FFmpeg-cvslog] Merge commit 'e3c4eb87e4d9650d76f6d8d790a9b749b325e973' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Jun  1 12:46:47 2015 +0200| [e3485640308ed45f605b4ce7e718a89a2e66c2c6] | committer: Michael Niedermayer

Merge commit 'e3c4eb87e4d9650d76f6d8d790a9b749b325e973' into release/2.2

* commit 'e3c4eb87e4d9650d76f6d8d790a9b749b325e973':
  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=e3485640308ed45f605b4ce7e718a89a2e66c2c6
---