]> git.sesse.net Git - ffmpeg/commit
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)
commit2bcf34a0ef60b8026d9f10fafda9b61ad302b85a
tree41f6d476daafbe27a0dbee45f708cc2488e6142b
parentc172683bf46a715baac867a49cdf621604592846
parent44127546b0a81dc9dd6190739a62d48f0044c6f3
Merge commit '44127546b0a81dc9dd6190739a62d48f0044c6f3'

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

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