Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:32:12 +0000 (01:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 23:32:12 +0000 (01:32 +0200)
commit63fdedc79470de309693d7ce7fe75cfcf0a268d8
treeb98a884e41547fc8bd94091dbf8b1f849094e913
parent0f69f02eb746124536a81effe9000a4dc876c7d8
parent074a1b37325bf6d1483fc23ebf1255e78d998339
Merge commit '074a1b37325bf6d1483fc23ebf1255e78d998339'

* commit '074a1b37325bf6d1483fc23ebf1255e78d998339':
  aacpsy: Check memory allocation

Conflicts:
libavcodec/aacpsy.c

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