Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Sep 2012 11:45:47 +0000 (13:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 26 Sep 2012 11:51:39 +0000 (13:51 +0200)
* qatar/master:
  xsub: feed init_get_bits the whole buffer
  libfdk-aac: Allow setting VBR modes via a private option
  libfdk-aac: Warn the user that the VBR modes are unsupported
  Revert "cbrt_tablegen: Include libm.h"

Conflicts:
libavcodec/xsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/cbrt_tablegen.c
libavcodec/libfdk-aacenc.c
libavcodec/xsubdec.c

Simple merge
Simple merge
Simple merge