[FFmpeg-cvslog] Merge commit '1411f073fdceeff1f39dbaa035c3c0275f69095f' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 17 23:08:10 2015 +0100| [0afeb76e75f09be06c58be94365a44d414599d05] | committer: Michael Niedermayer

Merge commit '1411f073fdceeff1f39dbaa035c3c0275f69095f' into release/2.4

* commit '1411f073fdceeff1f39dbaa035c3c0275f69095f':
  aacenc: correctly check returned value

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0afeb76e75f09be06c58be94365a44d414599d05
---