Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:23:32 +0000 (02:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:23:32 +0000 (02:23 +0200)
commit615e73ab4f8cd85e490c7d141fd710385bfaa8ac
treef8e3627021219f0026059e91e84e6d2b9808f185
parent1a903f0d1e989bc6fba98fdcbf8e222b5b8cfc6c
parent03927cb73399e6f07185fc7f8851d7612b4187b6
Merge commit '03927cb73399e6f07185fc7f8851d7612b4187b6'

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

Conflicts:
libavcodec/psymodel.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/psymodel.c