diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-07-12 13:22:01 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-07-12 13:22:01 +0000 |
| commit | 95a61cfc248c3745fe3b48c6f49ce04311a77e16 (patch) | |
| tree | 28ff52d2c665663a6927489f8ce2d37c217c0576 /configure | |
| parent | 68485d2728d80d5b2972d292982ed905e37fb6ae (diff) | |
| download | ffmpeg-95a61cfc248c3745fe3b48c6f49ce04311a77e16.tar.gz | |
Make VAAPI/VDPAU variant of decoder foo depend on decoder foo.
The VAAPI/VDPAU variants of foo require almost all of the code of foo.
Thus it makes little sense to enable just the accelerated variant.
This allows refactoring some object dependencies in the Makefiles.
Originally committed as revision 19403 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -1041,13 +1041,13 @@ flv_encoder_select="aandct" h261_encoder_select="aandct" h263_encoder_select="aandct" h263_vaapi_hwaccel_deps="va_va_h" -h263_vaapi_hwaccel_select="vaapi" +h263_vaapi_hwaccel_select="vaapi h263_decoder" h263p_encoder_select="aandct" h264_decoder_select="golomb" h264_vaapi_hwaccel_deps="va_va_h" h264_vaapi_hwaccel_select="vaapi" h264_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" -h264_vdpau_decoder_select="vdpau" +h264_vdpau_decoder_select="vdpau h264_decoder" imc_decoder_select="fft mdct" jpegls_decoder_select="golomb" jpegls_encoder_select="golomb" @@ -1058,13 +1058,13 @@ mpeg1video_encoder_select="aandct" mpeg2video_encoder_select="aandct" mpeg4_encoder_select="aandct" mpeg_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" -mpeg_vdpau_decoder_select="vdpau" +mpeg_vdpau_decoder_select="vdpau mpegvideo_decoder" mpeg1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" -mpeg1_vdpau_decoder_select="vdpau" +mpeg1_vdpau_decoder_select="vdpau mpeg1video_decoder" mpeg2_vaapi_hwaccel_deps="va_va_h" -mpeg2_vaapi_hwaccel_select="vaapi" +mpeg2_vaapi_hwaccel_select="vaapi mpeg2video_decoder" mpeg4_vaapi_hwaccel_deps="va_va_h" -mpeg4_vaapi_hwaccel_select="vaapi" +mpeg4_vaapi_hwaccel_select="vaapi mpeg4_decoder" mpeg_xvmc_decoder_deps="X11_extensions_XvMClib_h" msmpeg4v1_encoder_select="aandct" msmpeg4v2_encoder_select="aandct" @@ -1088,9 +1088,9 @@ tiff_decoder_suggest="zlib" tiff_encoder_suggest="zlib" tscc_decoder_select="zlib" vc1_vaapi_hwaccel_deps="va_va_h" -vc1_vaapi_hwaccel_select="vaapi" +vc1_vaapi_hwaccel_select="vaapi vc1_decoder" vc1_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" -vc1_vdpau_decoder_select="vdpau" +vc1_vdpau_decoder_select="vdpau vc1_decoder" vorbis_decoder_select="fft mdct" vorbis_encoder_select="fft mdct" wmav1_decoder_select="fft mdct" @@ -1100,9 +1100,9 @@ wmav2_encoder_select="fft mdct" wmv1_encoder_select="aandct" wmv2_encoder_select="aandct" wmv3_vaapi_hwaccel_deps="va_va_h" -wmv3_vaapi_hwaccel_select="vaapi" +wmv3_vaapi_hwaccel_select="vaapi wmv3_decoder" wmv3_vdpau_decoder_deps="vdpau_vdpau_h vdpau_vdpau_x11_h" -wmv3_vdpau_decoder_select="vdpau" +wmv3_vdpau_decoder_select="vdpau wmv3_decoder" zlib_decoder_select="zlib" zlib_encoder_select="zlib" zmbv_decoder_select="zlib" |