Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Feb 2013 11:58:26 +0000 (12:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 25 Feb 2013 11:58:31 +0000 (12:58 +0100)
* qatar/master:
  vorbisdec: Accept 0 amplitude_bits

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

Simple merge