summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_lavf.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-12-22 01:07:12 +0200
committerUoti Urpala <uau@mplayer2.org>2011-12-22 01:27:45 +0200
commit37e4a928ca78bad9ea5e7ec07c0561c511de8ac9 (patch)
tree88386fbcdd4013407666505638038066a1228784 /libmpdemux/demux_lavf.c
parent803dc1fb8ac29666c492bd45f6b2568d19167ef4 (diff)
downloadmpv-37e4a928ca78bad9ea5e7ec07c0561c511de8ac9.tar.bz2
mpv-37e4a928ca78bad9ea5e7ec07c0561c511de8ac9.tar.xz
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.
Diffstat (limited to 'libmpdemux/demux_lavf.c')
-rw-r--r--libmpdemux/demux_lavf.c22
1 files changed, 0 insertions, 22 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;