Merge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 01:05:02 +0000 (03:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Jun 2014 01:25:04 +0000 (03:25 +0200)
* commit '44127546b0a81dc9dd6190739a62d48f0044c6f3':
  Check if an mp3 header is using a reserved sample rate.

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

Simple merge