Michael Niedermayer 6ace8374ba Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  binkaudio: expand quant_table to accommodate all possible values
  libx264: Set the default of the rc_lookahead option to -1
  avcodec: Set flags2 default value depending on availability
  configure: declare dependency of h264_vaapi_hwaccel on h264_decoder

Conflicts:
	configure
	libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2011-11-05 01:46:14 +01:00

56 KiB

Raw Blame History

View Raw