From 21e4f1680c379407d77f0ac976aa8236f8227be0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 13 Mar 2013 09:29:34 +0100 Subject: 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). --- compat/libav.h | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'compat') diff --git a/compat/libav.h b/compat/libav.h index ef588fe025..a2957f4b71 100644 --- a/compat/libav.h +++ b/compat/libav.h @@ -32,17 +32,4 @@ #define AV_CODEC_ID_SUBRIP AV_CODEC_ID_TEXT #endif -#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 36, 0) -#define av_get_packed_sample_fmt(x) (x) -#endif - -#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 28, 0) -#define avcodec_free_frame av_freep -#endif - -// For Libav 0.9 -#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(54, 2, 100) -#define AV_DISPOSITION_ATTACHED_PIC 0x0400 -#endif - #endif /* MPV_LIBAV_COMPAT_H */ -- cgit v1.2.3