diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 19:54:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-20 19:54:45 +0100 |
| commit | 78e39aa7ee12bb61cf34d8ca6bebd129d659d9cd (patch) | |
| tree | 7d3aed0445c3d2379842ea2a6dd39e3d3387ac3d /configure | |
| parent | eef74b2e97139d8422f76a0f8241aed17fc0617d (diff) | |
| parent | b7702fafb356b757dcd1b3d1ed4f2f32e4ebe9c1 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Avoid a possible overflow when reading Nikon avi files.
Add h263dsp dependency to mpeg1video and mpeg2video encoders.
Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1962,9 +1962,9 @@ mpc8_decoder_select="dsputil mpegaudiodsp" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" mpeg_xvmc_decoder_select="mpeg2video_decoder" mpeg1video_decoder_select="error_resilience mpegvideo" -mpeg1video_encoder_select="aandcttables mpegvideoenc" +mpeg1video_encoder_select="aandcttables mpegvideoenc h263dsp" mpeg2video_decoder_select="error_resilience mpegvideo" -mpeg2video_encoder_select="aandcttables mpegvideoenc" +mpeg2video_encoder_select="aandcttables mpegvideoenc h263dsp" mpeg4_decoder_select="h263_decoder mpeg4video_parser" mpeg4_encoder_select="h263_encoder" msmpeg4v1_decoder_select="h263_decoder" |