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

Michael Niedermayer git at videolan.org
Sat Nov 5 02:03:16 CET 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  5 01:46:14 2011 +0100| [6ace8374bacf33e5f3407cb50e928e7533eb5e92] | committer: Michael Niedermayer

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

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





More information about the ffmpeg-cvslog mailing list