Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Sep 2012 13:06:43 +0000 (15:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Sep 2012 13:06:43 +0000 (15:06 +0200)
commit4cdc337b5da22ff30335a9de424a1510e9b3fe49
treec898dea5b42d58d367583518ab22c91a4b388276
parent91af76099e0649a26a411d3f704a826840006296
parent6a08955c104450dfc8f56aa9f552a4c08f8d8f7f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  flvenc: silence bogus warning
  configure: include flags in nm variable
  alsdec: fix misplaced parentheses.
  alsdec: check return values.
  alsdec: fix number of decoded samples in first sub-block in BGMC mode.
  alsdec: Fix out of ltp_gain_values read.
  alsdec: Check that quantized parcor coeffs are within range.
  alsdec: check opt_order.

Conflicts:
configure
libavcodec/alsdec.c
libavformat/flvenc.c

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