configure, build: require at least Libav 0.7

Require versions of the Libav libraries corresponding to Libav release
0.7. These are:
libavutil   51.7.0
libavcodec  53.5.0
libavformat 53.2.0
libswscale   2.0.0
libpostproc 52.0.0

Also disable the fallback to simple header check if these libraries
could not be found with pkg-config; now compiling without pkg-config
support for these always requires explicitly setting --enable-libav
and any needed compiler/linker flags. The simple check would have let
compilation proceed even if a version mismatch was detected.

3 files changed, 0 insertions, 30 deletions

diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index d25ceb8b95..74948fb68d 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -242,12 +242,6 @@ static const char * const preferred_internal[] = {
     /* lavf Matroska demuxer doesn't support ordered chapters and fails
      * for more files */
     "matroska",
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52, 99, 0)
-    /* Seeking doesn't work with lavf FLAC demuxer in FFmpeg versions
-     * without a FLAC parser. In principle this could use a runtime check to
-     * switch if a shared library is updated. */
-    "flac",
-#endif
     /* lavf gives neither pts nor dts for some video frames in .rm */
     "rm",
     NULL
@@ -712,23 +706,7 @@ static void check_internet_radio_hack(struct demuxer *demuxer)
         if (!priv->internet_radio_hack) {
             mp_msg(MSGT_DEMUX, MSGL_V,
                    "[lavf] enabling internet ogg radio hack\n");
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-            mp_tmsg(MSGT_DEMUX, MSGL_WARN, "[lavf] This looks like an "
-                    "internet radio ogg stream with track changes.\n"
-                    "Playback will likely fail after %d track changes "
-                    "due to libavformat limitations.\n"
-                    "You may be able to work around that limitation by "
-                    "using -demuxer ogg.\n", MAX_STREAMS);
-#endif
         }
-#if LIBAVFORMAT_VERSION_MAJOR < 53
-        if (avfc->nb_streams == MAX_STREAMS) {
-            mp_tmsg(MSGT_DEMUX, MSGL_WARN, "[lavf] This is the %dth "
-                    "track.\nPlayback will likely fail at the next change.\n"
-                    "You may be able to work around this limitation by "
-                    "using -demuxer ogg.\n", MAX_STREAMS);
-        }
-#endif
         priv->internet_radio_hack = true;
         // use new per-track metadata as global metadata
         AVMetadataTag *t = NULL;
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 8afeedac8c..199558c2ae 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -501,11 +501,9 @@ static void allocate_parser(AVCodecContext **avctx, AVCodecParserContext **parse
     enum CodecID codec_id = CODEC_ID_NONE;
 
     switch (format) {
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 0)
     case MKTAG('M', 'P', '4', 'L'):
         codec_id = CODEC_ID_AAC_LATM;
         break;
-#endif
     case 0x2000:
     case 0x332D6361:
     case 0x332D4341:
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 336d60bd9c..c04c700f8a 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -44,9 +44,7 @@ static const struct mp_AVCodecTag mp_wav_tags[] = {
     { CODEC_ID_MUSEPACK7,         MKTAG('M', 'P', 'C', ' ')},
     { CODEC_ID_MUSEPACK8,         MKTAG('M', 'P', 'C', '8')},
     { CODEC_ID_NELLYMOSER,        MKTAG('N', 'E', 'L', 'L')},
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 92, 0)
     { CODEC_ID_PCM_LXF,           MKTAG('P', 'L', 'X', 'F')},
-#endif
     { CODEC_ID_QCELP,             MKTAG('Q', 'c', 'l', 'p')},
     { CODEC_ID_QDM2,              MKTAG('Q', 'D', 'M', '2')},
     { CODEC_ID_RA_144,            MKTAG('1', '4', '_', '4')},
@@ -66,9 +64,7 @@ const struct mp_AVCodecTag * const mp_wav_taglists[] = {mp_ff_codec_wav_tags, mp
 
 static const struct mp_AVCodecTag mp_codecid_override_tags[] = {
     { CODEC_ID_AAC,               MKTAG('M', 'P', '4', 'A')},
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 94, 0)
     { CODEC_ID_AAC_LATM,          MKTAG('M', 'P', '4', 'L')},
-#endif
     { CODEC_ID_AC3,               0x2000},
     { CODEC_ID_ADPCM_IMA_AMV,     MKTAG('A', 'M', 'V', 'A')},
     { CODEC_ID_BINKAUDIO_DCT,     MKTAG('B', 'A', 'U', '1')},
@@ -109,9 +105,7 @@ static const struct mp_AVCodecTag mp_bmp_tags[] = {
     { CODEC_ID_FLIC,              MKTAG('F', 'L', 'I', 'C')},
     { CODEC_ID_IDCIN,             MKTAG('I', 'D', 'C', 'I')},
     { CODEC_ID_INTERPLAY_VIDEO,   MKTAG('I', 'N', 'P', 'V')},
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 114, 0)
     { CODEC_ID_JV,                MKTAG('F', 'F', 'J', 'V')},
-#endif
     { CODEC_ID_MDEC,              MKTAG('M', 'D', 'E', 'C')},
     { CODEC_ID_MOTIONPIXELS,      MKTAG('M', 'V', 'I', '1')},
     { CODEC_ID_NUV,               MKTAG('N', 'U', 'V', '1')},