diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 04:12:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-28 04:12:24 +0200 |
| commit | 7b453d1c60005cd1e0461a8d06d07e89116772d4 (patch) | |
| tree | 55f5b363a0f6b5f447026edb8e80b38ef8c22437 /configure | |
| parent | 4a619fcae99c7fc8cae7070c7859243c40cdb4bc (diff) | |
| parent | 55abaa58e5ede59d497e1ab89d5fe0950d1c6ecf (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
westwood_vqa: fix SND0 chunk handling
westwood_vqa: set video stream duration
raw: forward avpicture_fill() error code in raw_decode().
build: Do not explicitly add the doc directory to the OBJDIRS list.
dv: Split off DV video decoder into its own file.
build: fix RALF decoder standalone compilation, which depends on Golomb code
configure: Drop stray duplicate entry for --disable-fft from help output.
Conflicts:
libavcodec/dv.c
libavcodec/rawdec.c
libavformat/westwood_vqa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -118,7 +118,6 @@ Component options: --enable-x11grab enable X11 grabbing [no] --disable-network disable network support [no] --disable-dct disable DCT code - --disable-fft disable FFT code --disable-mdct disable MDCT code --disable-rdft disable RDFT code --disable-fft disable FFT code @@ -1482,6 +1481,7 @@ png_encoder_select="zlib" qcelp_decoder_select="lsp" qdm2_decoder_select="mdct rdft mpegaudiodsp" ra_144_encoder_select="lpc" +ralf_decoder_select="golomb" rv10_decoder_select="h263_decoder" rv10_encoder_select="h263_encoder" rv20_decoder_select="h263_decoder" |