Michael Niedermayer ae0449314c 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>

2012-09-26 13:51:39 +02:00

1.1 KiB

Raw Blame History

View Raw