Merge commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 21:41:13 +0000 (23:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 21:41:16 +0000 (23:41 +0200)
commit5badcfe2200c896534c7d8575ab321415fcf7358
treeb5ac3e0cfac8dfe30f56a4bf757592ced3da85f7
parenta89e9ad1c8625e332764c3cd61fd469b3eb92140
parentd07aa3f02b73ab1371c13ac7898338380ca0932b
Merge commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b'

* commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b':
  riffdec: Add sanity checks for the sample rate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/riffdec.c