diff options
author | wm4 <wm4@nowhere> | 2013-03-13 09:29:34 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-03-13 23:52:04 +0100 |
commit | 21e4f1680c379407d77f0ac976aa8236f8227be0 (patch) | |
tree | c113e61c55d97d8ca9238acc8659d5452cb65bfb /configure | |
parent | 048ceef655bce41bc6e215b5e05cec0fad4d1428 (diff) | |
download | mpv-21e4f1680c379407d77f0ac976aa8236f8227be0.tar.bz2 mpv-21e4f1680c379407d77f0ac976aa8236f8227be0.tar.xz |
configure: bump minimum FFmpeg/Libav versions, remove compat hacks
We consider FFmpeg 1.x and Libav 0.9.x releases compatible. Support
for FFmpeg 0.9.x and Libav 0.8.x is considered infeasible and has been
dropped in the previous commits. The bits that break compatibility are
mainly the CodecID renaming (trivial, but would require nasty hacks
everywhere), the avcodec_encode_video2() function (missing in older
releases, mandatory in newer ones), and the resampler changes (older
releases miss lib{av,sw}resample, newer versions removed the
libavcodec resampler).
Remove some other compatibility bits that were needed to for releases
for which we drop support.
The comment about Libav 0.9 in compat/libav.h is incorrect and should
have been 0.8 (the symbol is present in Libav 0.9).
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 37 |
1 files changed, 1 insertions, 36 deletions
@@ -2675,9 +2675,7 @@ fi echores "$_lcms2" -# Test with > against Libav 0.8 versions which will NOT work rather than -# specify minimum version, to allow (future) point releases to possibly work. -all_libav_libs="libavutil > 51.22.0:libavcodec >= 53.35.0:libavformat > 53.20.0:libswscale >= 2.0.0" +all_libav_libs="libavutil > 51.73.0:libavcodec > 54.34.0:libavformat > 54.19.0:libswscale >= 2.0.0" echocheck "Libav ($all_libav_libs)" if test "$ffmpeg" = auto ; then IFS=":" # shell should not be used for programming @@ -2713,37 +2711,6 @@ if test "$_resampler" = no ; then fi -echocheck "Libav 0.8 compatibility hack" -if test "$_encoding" = yes && $_pkg_config "libavcodec >= 54.0.0" ; then - echores "no" -else - _encoding=no - echores "yes" -fi - - -echocheck "libavcodec AVCodecDescriptor API" -_avcodec_codec_desc_api=no -statement_check libavcodec/avcodec.h 'const AVCodecDescriptor *desc = avcodec_descriptor_get_by_name("c")' && _avcodec_codec_desc_api=yes -if test "$_avcodec_codec_desc_api" = yes ; then - def_avcodec_codec_desc_api='#define HAVE_AVCODEC_CODEC_DESC_API 1' -else - def_avcodec_codec_desc_api='#define HAVE_AVCODEC_CODEC_DESC_API 0' -fi -echores "$_avcodec_codec_desc_api" - - -echocheck "libavcodec av_codec_is_decoder API" -_avcodec_is_decoder_api=no -statement_check libavcodec/avcodec.h 'av_codec_is_decoder(NULL)' && _avcodec_is_decoder_api=yes -if test "$_avcodec_is_decoder_api" = yes ; then - def_avcodec_is_decoder_api='#define HAVE_AVCODEC_IS_DECODER_API 1' -else - def_avcodec_is_decoder_api='#define HAVE_AVCODEC_IS_DECODER_API 0' -fi -echores "$_avcodec_is_decoder_api" - - echocheck "libavutil ref-counting API" _avutil_has_refcounting=no statement_check libavutil/frame.h 'av_frame_unref(NULL)' && _avutil_has_refcounting=yes @@ -3253,8 +3220,6 @@ $def_vcd $def_mpg123 $def_zlib -$def_avcodec_codec_desc_api -$def_avcodec_is_decoder_api $def_avutil_has_refcounting $def_libpostproc $def_libavdevice |