Michael Niedermayer 615e73ab4f Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6' ...

* commit '03927cb73399e6f07185fc7f8851d7612b4187b6':
  psymodel: Check memory allocation

Conflicts:
	libavcodec/psymodel.c

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

2015-06-01 02:23:32 +02:00

5.0 KiB

Raw Blame History

View Raw