mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
configure: simplify negative dependencies
Originally committed as revision 14195 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3250003c79
commit
1b71f04586
10
configure
vendored
10
configure
vendored
@ -831,7 +831,7 @@ ssse3_deps="x86"
|
|||||||
vis_deps="sparc"
|
vis_deps="sparc"
|
||||||
|
|
||||||
# decoders / encoders
|
# decoders / encoders
|
||||||
ac3_decoder_deps="gpl"
|
ac3_decoder_deps="gpl !liba52"
|
||||||
dxa_decoder_deps="zlib"
|
dxa_decoder_deps="zlib"
|
||||||
flashsv_decoder_deps="zlib"
|
flashsv_decoder_deps="zlib"
|
||||||
flashsv_encoder_deps="zlib"
|
flashsv_encoder_deps="zlib"
|
||||||
@ -849,7 +849,7 @@ libamr_nb_decoder_deps="libamr_nb"
|
|||||||
libamr_nb_encoder_deps="libamr_nb"
|
libamr_nb_encoder_deps="libamr_nb"
|
||||||
libamr_wb_decoder_deps="libamr_wb"
|
libamr_wb_decoder_deps="libamr_wb"
|
||||||
libamr_wb_encoder_deps="libamr_wb"
|
libamr_wb_encoder_deps="libamr_wb"
|
||||||
libdirac_decoder_deps="libdirac"
|
libdirac_decoder_deps="libdirac !libschroedinger"
|
||||||
libdirac_encoder_deps="libdirac"
|
libdirac_encoder_deps="libdirac"
|
||||||
libfaac_encoder_deps="libfaac"
|
libfaac_encoder_deps="libfaac"
|
||||||
libfaad_decoder_deps="libfaad"
|
libfaad_decoder_deps="libfaad"
|
||||||
@ -1688,12 +1688,6 @@ enabled libx264 && require x264 x264.h x264_encoder_open -lx264 -lm
|
|||||||
enabled libxvid && require Xvid xvid.h xvid_global -lxvidcore
|
enabled libxvid && require Xvid xvid.h xvid_global -lxvidcore
|
||||||
enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
|
enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib
|
||||||
|
|
||||||
# disable the native AC-3 decoder if liba52 is enabled
|
|
||||||
enabled liba52 && disable ac3_decoder
|
|
||||||
|
|
||||||
# disable the slower libdirac decoder if libschroedinger is enabled
|
|
||||||
enabled libschroedinger && enabled libdirac && disable libdirac_decoder
|
|
||||||
|
|
||||||
# libdc1394 check
|
# libdc1394 check
|
||||||
if enabled libdc1394; then
|
if enabled libdc1394; then
|
||||||
{ check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 &&
|
{ check_lib dc1394/dc1394.h dc1394_new -ldc1394 -lraw1394 &&
|
||||||
|
Loading…
x
Reference in New Issue
Block a user