Merge commit '7997acee0542f6e0bb9ea42ff783f80b70878a2f' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 10:48:51 +0000 (12:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Aug 2014 10:48:55 +0000 (12:48 +0200)
commit244a58fff0adabcce3f9ea80d848a562ff377843
treefe546497572987521d63a1cbfdce237946f0aca4
parent4dfd4399eaca17360fbe302153ee6f0ad86603e0
parent7997acee0542f6e0bb9ea42ff783f80b70878a2f
Merge commit '7997acee0542f6e0bb9ea42ff783f80b70878a2f' into release/1.1

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

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