[FFmpeg-cvslog] Merge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 23 03:05:02 2014 +0200| [2bcf34a0ef60b8026d9f10fafda9b61ad302b85a] | committer: Michael Niedermayer

Merge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3'

* commit '44127546b0a81dc9dd6190739a62d48f0044c6f3':
  Check if an mp3 header is using a reserved sample rate.

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

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