Michael Niedermayer e5cb7795fc 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: 4d7c71c364
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-07-17 14:20:10 +02:00

4.9 KiB

Raw Blame History

View Raw