X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=8b88daf414c98d8eaf16eed8d938295339e5ef1f;hb=b51e9354772de446e8196dabf9aad1567b22f74d;hp=7c479b263306d1598db55807d1f43ddd0dd96e94;hpb=357a733f91ac96d5806856b83081f3f7dace01fe;p=ffmpeg diff --git a/configure b/configure index 7c479b26330..8b88daf414c 100755 --- a/configure +++ b/configure @@ -251,6 +251,7 @@ External library support: --enable-libzvbi enable teletext support via libzvbi [no] --enable-openal enable OpenAL 1.1 capture support [no] --enable-opencl enable OpenCL code + --enable-opengl enable OpenGL rendering [no] --enable-openssl enable openssl [no] --enable-x11grab enable X11 grabbing [no] --disable-zlib disable zlib [autodetect] @@ -1246,6 +1247,7 @@ EXAMPLE_LIST=" filtering_video_example metadata_example muxing_example + remuxing_example resampling_audio_example scaling_video_example transcode_aac_example @@ -1310,6 +1312,7 @@ EXTERNAL_LIBRARY_LIST=" libzvbi openal opencl + opengl openssl x11grab zlib @@ -1553,6 +1556,7 @@ HAVE_LIST=" dxva_h ebp_available ebx_available + ES2_gl_h fast_64bit fast_clz fast_cmov @@ -1569,6 +1573,7 @@ HAVE_LIST=" getservbyport gettimeofday glob + glXGetProcAddress gnu_as gnu_windres gsm_h @@ -1602,6 +1607,7 @@ HAVE_LIST=" mprotect nanosleep openjpeg_1_5_openjpeg_h + OpenGL_gl3_h PeekNamedPipe perl pod2man @@ -1655,6 +1661,7 @@ HAVE_LIST=" vdpau_x11 vfp_args VirtualAlloc + wglGetProcAddress windows_h winsock2_h xform_asm @@ -1682,6 +1689,7 @@ CONFIG_EXTRA=" huffman intrax8 lgplv3 + llviddsp lpc mpegaudio mpegaudiodsp @@ -1802,6 +1810,7 @@ x86_64_suggest="fast_cmov" amd3dnow_deps="mmx" amd3dnowext_deps="amd3dnow" +i686_deps="x86" mmx_deps="x86" mmxext_deps="mmx" sse_deps="mmxext" @@ -1903,8 +1912,8 @@ eatqi_decoder_select="aandcttables error_resilience mpegvideo" exr_decoder_select="zlib" ffv1_decoder_select="dsputil golomb rangecoder" ffv1_encoder_select="dsputil rangecoder" -ffvhuff_decoder_select="dsputil" -ffvhuff_encoder_select="dsputil huffman" +ffvhuff_decoder_select="dsputil llviddsp" +ffvhuff_encoder_select="dsputil huffman llviddsp" flac_decoder_select="golomb" flac_encoder_select="dsputil golomb lpc" flashsv_decoder_select="zlib" @@ -1926,8 +1935,8 @@ h263p_encoder_select="h263_encoder" h264_decoder_select="golomb h264chroma h264dsp h264pred h264qpel videodsp" h264_decoder_suggest="error_resilience" hevc_decoder_select="dsputil golomb videodsp" -huffyuv_decoder_select="dsputil" -huffyuv_encoder_select="dsputil huffman" +huffyuv_decoder_select="dsputil llviddsp" +huffyuv_encoder_select="dsputil huffman llviddsp" iac_decoder_select="dsputil fft mdct sinewin" imc_decoder_select="dsputil fft mdct sinewin" indeo3_decoder_select="hpeldsp" @@ -1961,9 +1970,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" @@ -1995,8 +2004,8 @@ shorten_decoder_select="golomb" sipr_decoder_select="lsp" snow_decoder_select="dsputil dwt h264qpel hpeldsp rangecoder" snow_encoder_select="aandcttables dsputil dwt h264qpel hpeldsp mpegvideoenc rangecoder" -sonic_decoder_select="golomb" -sonic_encoder_select="golomb" +sonic_decoder_select="golomb rangecoder" +sonic_encoder_select="golomb rangecoder" sonic_ls_encoder_select="golomb" sp5x_decoder_select="dsputil hpeldsp exif" svq1_decoder_select="hpeldsp" @@ -2238,6 +2247,7 @@ wav_demuxer_select="riffdec" wav_muxer_select="riffenc" webm_muxer_select="riffenc" wtv_demuxer_select="riffdec" +wtv_muxer_select="riffenc" xmv_demuxer_select="riffdec" xwma_demuxer_select="riffdec" @@ -2259,6 +2269,7 @@ libcdio_indev_deps="libcdio" libdc1394_indev_deps="libdc1394" libv4l2_indev_deps="libv4l2" openal_indev_deps="openal" +opengl_outdev_deps="opengl" oss_indev_deps_any="soundcard_h sys_soundcard_h" oss_outdev_deps_any="soundcard_h sys_soundcard_h" pulse_indev_deps="libpulse" @@ -2385,6 +2396,7 @@ filtering_audio_example_deps="avfilter avcodec avformat avutil" filtering_video_example_deps="avfilter avcodec avformat avutil" metadata_example_deps="avformat avutil" muxing_example_deps="avcodec avformat avutil swscale" +remuxing_example_deps="avcodec avformat avutil" resampling_audio_example_deps="avutil swresample" scaling_video_example_deps="avutil swscale" transcode_aac_example_deps="avcodec avformat swresample" @@ -2510,8 +2522,6 @@ HOSTCC_E='-E -o $@' HOSTCC_O='-o $@' HOSTLD_O='-o $@' -host_cflags='-O3' -host_cppflags='-D_ISOC99_SOURCE' host_libs='-lm' host_cflags_filter=echo host_ldflags_filter=echo @@ -3105,7 +3115,7 @@ probe_cc(){ elif $_cc -v 2>&1 | grep -q clang; then _type=clang _ident=$($_cc --version | head -n1) - _depflags='-MMD' + _depflags='-MMD -MF $(@:.o=.d) -MT $@' _cflags_speed='-O3' _cflags_size='-Os' elif $_cc -V 2>&1 | grep -q Sun; then @@ -3594,8 +3604,10 @@ check_cc -D_LARGEFILE_SOURCE < EOF +add_host_cppflags -D_ISOC99_SOURCE check_host_cflags -std=c99 check_host_cflags -Wall +check_host_cflags -O3 check_64bit(){ arch32=$1 @@ -4423,7 +4435,9 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 && die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } enabled libcaca && require_pkg_config caca caca.h caca_create_canvas enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac -enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac +enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && + { check_cpp_condition fdk-aac/aacenc_lib.h "AACENCODER_LIB_VL0 >= 3 && AACENCODER_LIB_VL1 >= 4 && AACENCODER_LIB_VL2 >= 12" || + die "ERROR: libfdk_aac must be installed and version must be >= 3.4.12."; } flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite" enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs enabled libfreetype && require_libfreetype @@ -4492,6 +4506,12 @@ enabled opencl && { check_lib2 OpenCL/cl.h clEnqueueNDRangeKernel -Wl { check_cpp_condition "OpenCL/cl.h" "defined(CL_VERSION_1_2)" || check_cpp_condition "CL/cl.h" "defined(CL_VERSION_1_2)" || die "ERROR: opencl must be installed and version must be 1.2 or compatible"; } +enabled opengl && { check_lib GL/glx.h glXGetProcAddress "-lGL" || + check_lib2 windows.h wglGetProcAddress "-lopengl32 -lgdi32" || + check_lib2 OpenGL/gl3.h glGetError "-Wl,-framework,OpenGL" || + check_lib2 ES2/gl.h glGetError "-isysroot=${sysroot} -Wl,-framework,OpenGLES" || + die "ERROR: opengl not found." + } enabled openssl && { check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto || check_lib openssl/ssl.h SSL_library_init -lssl32 -leay32 || check_lib openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||