Michael Niedermayer a4f8a56495 Merge commit '4736d003fac30af4afd8390182f12f480ad78801' ...

* commit '4736d003fac30af4afd8390182f12f480ad78801':
  cavsdec: check ff_get_buffer() return value

Conflicts:
	libavcodec/cavsdec.c

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

2014-01-06 15:52:44 +01:00

55 KiB

Raw Blame History

View Raw