Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Nov 2011 00:46:14 +0000 (01:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Nov 2011 00:46:14 +0000 (01:46 +0100)
commit6ace8374bacf33e5f3407cb50e928e7533eb5e92
tree4f32b5abef0b42737d7f27e028f0ccb513cc2d01
parent8b1032c923af5b7360eac2cf8c1535256a5d4d92
parentadd7b1140fdd0651d0fc9352962631807126d3d0
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>
configure
libavcodec/binkaudio.c
libavcodec/options.c