diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-05 01:46:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-05 01:46:14 +0100 |
| commit | 6ace8374bacf33e5f3407cb50e928e7533eb5e92 (patch) | |
| tree | 4f32b5abef0b42737d7f27e028f0ccb513cc2d01 /libavcodec/version.h | |
| parent | 8b1032c923af5b7360eac2cf8c1535256a5d4d92 (diff) | |
| parent | add7b1140fdd0651d0fc9352962631807126d3d0 (diff) | |
| download | ffmpeg-6ace8374bacf33e5f3407cb50e928e7533eb5e92.tar.gz | |
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>
Diffstat (limited to 'libavcodec/version.h')
0 files changed, 0 insertions, 0 deletions