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)
commitae0449314ca61e84c64568546922e91f5d81d500
treefed1676cf7c8c756bf396c099eaa28abcb3398d8
parent4552e9b56c8e1a90251a34d0e1f916feb508dd28
parent92d2b909a0de6e2f77a98405280c78052b35b421
Merge remote-tracking branch 'qatar/master'

* 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>
libavcodec/cbrt_tablegen.c
libavcodec/libfdk-aacenc.c
libavcodec/xsubdec.c