diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-12-22 01:07:12 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-12-22 01:27:45 +0200 |
| commit | 37e4a928ca78bad9ea5e7ec07c0561c511de8ac9 (patch) | |
| tree | 88386fbcdd4013407666505638038066a1228784 /libmpdemux/demuxer.c | |
| parent | 803dc1fb8ac29666c492bd45f6b2568d19167ef4 (diff) | |
| download | mpv-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/demuxer.c')
| -rw-r--r-- | libmpdemux/demuxer.c | 2 |
1 files changed, 0 insertions, 2 deletions
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: |