diff options
| author | Alexis Ballier <aballier@gentoo.org> | 2013-08-02 09:46:28 -0400 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-08-06 10:18:36 -0400 |
| commit | cbc86160fbc4095c142a19baf40bbe5724cfb721 (patch) | |
| tree | f04856e64091e1c099454fd4e2959a45adf1024b /lib | |
| parent | cb827df865393d40b606ca832d07bffbdeb6f83d (diff) | |
DllAvUtil: Drop libav hacks and move them to libav_hacks.h.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/DllAvUtil.h | 9 | ||||
| -rw-r--r-- | lib/xbmc-libav-hacks/libav_hacks.h | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h index 71900c5b6c..26dd95294d 100644 --- a/lib/DllAvUtil.h +++ b/lib/DllAvUtil.h @@ -62,14 +62,7 @@ extern "C" { #endif } -#if LIBAVUTIL_VERSION_MICRO >= 100 - #define LIBAVUTIL_FROM_FFMPEG -#else - #define LIBAVUTIL_FROM_LIBAV -#endif - -#if (defined LIBAVUTIL_FROM_FFMPEG && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100)) || \ - (defined LIBAVUTIL_FROM_LIBAV && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,8,0)) +#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(52,29,100) #define AVFRAME_IN_LAVU #endif diff --git a/lib/xbmc-libav-hacks/libav_hacks.h b/lib/xbmc-libav-hacks/libav_hacks.h index 84ae3d0605..46fa6c93fb 100644 --- a/lib/xbmc-libav-hacks/libav_hacks.h +++ b/lib/xbmc-libav-hacks/libav_hacks.h @@ -37,6 +37,8 @@ // libavutil +#define AVFRAME_IN_LAVU + #define AV_CODEC_ID_OTF AV_CODEC_ID_TTF AVDictionary *av_frame_get_metadata (const AVFrame *frame); |