Michael Niedermayer 42316907b8 Merge commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe' ...

* commit 'af7ca6ea124b82b337a6b96e10963e88eba57ebe':
  nutdec: check av_new_packet return value

Conflicts:
	libavformat/nutdec.c

See: bb502411dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-10-22 00:26:37 +02:00

40 KiB

Raw Blame History

View Raw