[FFmpeg-cvslog] Merge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 12 12:40:57 2013 +0100| [3ccda2b02ba643df35bf76988cfecba0c5034bb1] | committer: Michael Niedermayer

Merge commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d'

* commit '375ef6528c9dd2db7f9881e232cb0ec3aa16970d':
  libfdk-aacenc: Actually check for upper bounds of cutoff
  arm: Fall back to runtime cpu feature detection via /proc/cpuinfo

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

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