Commit 57f0ec6e authored by Måns Rullgård's avatar Måns Rullgård
Browse files

fix configure with libx264 disabled

Originally committed as revision 15647 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7c19b88f
...@@ -1728,8 +1728,8 @@ enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) && ...@@ -1728,8 +1728,8 @@ enabled libschroedinger && add_cflags $(pkg-config --cflags schroedinger-1.0) &&
enabled libtheora && require libtheora theora/theora.h theora_info_init -ltheora -logg enabled libtheora && require libtheora theora/theora.h theora_info_init -ltheora -logg
enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
enabled libx264 && require x264 x264.h x264_encoder_open -lx264 -lm && enabled libx264 && require x264 x264.h x264_encoder_open -lx264 -lm &&
check_cpp_condition x264.h "X264_BUILD >= 65" || { check_cpp_condition x264.h "X264_BUILD >= 65" ||
die "ERROR: libx264 version must be >= 0.65." die "ERROR: libx264 version must be >= 0.65."; }
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment