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)
* commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b':
  riffdec: Add sanity checks for the sample rate

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

Simple merge