Michael Niedermayer 3a8b16f78e Merge commit '69277069dd225f5ae02f0215e877a06522d834d3' ...

* commit '69277069dd225f5ae02f0215e877a06522d834d3':
  dct: Check memory allocation

Conflicts:
	libavcodec/dct.c

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

2015-06-01 01:42:13 +02:00

5.4 KiB

Raw Blame History

View Raw