[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

Michael Niedermayer git at videolan.org
Wed Sep 26 13:52:02 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 26 13:45:47 2012 +0200| [ae0449314ca61e84c64568546922e91f5d81d500] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae0449314ca61e84c64568546922e91f5d81d500
---





More information about the ffmpeg-cvslog mailing list