Merge commit '68ff9981283a56c731f00c2ee7901103665092fc'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 20:42:26 +0000 (22:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Sep 2013 20:42:31 +0000 (22:42 +0200)
* commit '68ff9981283a56c731f00c2ee7901103665092fc':
  vqf: Make sure the bitrate is in the valid range

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

Simple merge