Merge commit '971099ff5a85377579eb5b8d3620e283957f097e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:44:39 +0000 (04:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 03:45:32 +0000 (04:45 +0100)
commit5387b0cbfb6eef2d502cc22bc2ab4ed7308ffcac
tree96d80fa8dfea4ce6e0b78ef16f5af894423c6864
parent445ec2dfcbdc448fb9e6c88049d815f663fcb8a2
parent971099ff5a85377579eb5b8d3620e283957f097e
Merge commit '971099ff5a85377579eb5b8d3620e283957f097e'

* commit '971099ff5a85377579eb5b8d3620e283957f097e':
  aacenc: correctly check returned value

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