Merge commit 'fcbcc561e0fdc95a7dd48b92db53846726aec27e' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:25:23 +0000 (22:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jul 2014 20:25:23 +0000 (22:25 +0200)
commit00049f193d07cec0409069bc51d0dcb8ab9da837
tree5f1dfd1063f36dffb9f35ed4029cbf80772b7ff8
parentd832020bd853f84b96a3fdf3e0a385d8492ec8c8
parentfcbcc561e0fdc95a7dd48b92db53846726aec27e
Merge commit 'fcbcc561e0fdc95a7dd48b92db53846726aec27e' into release/2.2

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

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