diff options
| author | Alexis Ballier <aballier@gentoo.org> | 2013-05-17 07:52:45 -0400 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-05-17 07:52:45 -0400 |
| commit | 37c2da8f8cfbba653e3c60103a8816a29787919b (patch) | |
| tree | 94a1d2e91cb18dc2b0df05bd007fbd6d747d522f /lib | |
| parent | d7c50d926045783a9ed237a324e5aa70b6ca2139 (diff) | |
Drop checks for libav*/opt.h.
It has been moved to libavutil/opt.h in 2010, libavutil versin 50, and xbmc requires ffmpeg 1.0, libavutil version 51.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/DllAvCodec.h | 4 | ||||
| -rw-r--r-- | lib/DllAvUtil.h | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h index a8a1e93c86..09a5fddbc8 100644 --- a/lib/DllAvCodec.h +++ b/lib/DllAvCodec.h @@ -45,12 +45,8 @@ extern "C" { #if (defined USE_EXTERNAL_FFMPEG) #if (defined HAVE_LIBAVCODEC_AVCODEC_H) #include <libavcodec/avcodec.h> - #if (defined HAVE_LIBAVCODEC_OPT_H) - #include <libavcodec/opt.h> - #endif #elif (defined HAVE_FFMPEG_AVCODEC_H) #include <ffmpeg/avcodec.h> - #include <ffmpeg/opt.h> #endif #else #include "libavcodec/avcodec.h" diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h index 4d5bec96c2..04284d394f 100644 --- a/lib/DllAvUtil.h +++ b/lib/DllAvUtil.h @@ -55,13 +55,7 @@ extern "C" { // for LIBAVCODEC_VERSION_INT: #include <ffmpeg/avcodec.h> #endif - #if defined(HAVE_LIBAVUTIL_OPT_H) - #include <libavutil/opt.h> - #elif defined(HAVE_LIBAVCODEC_AVCODEC_H) - #include <libavcodec/opt.h> - #else - #include <ffmpeg/opt.h> - #endif + #include <libavutil/opt.h> #if defined(HAVE_LIBAVUTIL_MEM_H) #include <libavutil/mem.h> #else |