diff options
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | lib/DllAvCodec.h | 6 | ||||
| -rw-r--r-- | lib/DllAvFilter.h | 12 | ||||
| -rw-r--r-- | lib/DllAvFormat.h | 6 | ||||
| -rw-r--r-- | lib/DllAvUtil.h | 24 | ||||
| -rw-r--r-- | lib/DllPostProc.h | 12 | ||||
| -rw-r--r-- | lib/DllSwScale.h | 6 |
7 files changed, 16 insertions, 53 deletions
diff --git a/configure.in b/configure.in index 10fae0d1a8..2d65a559b5 100644 --- a/configure.in +++ b/configure.in @@ -1620,8 +1620,7 @@ if test "$use_external_ffmpeg" = "yes"; then # Possible places the ffmpeg headers may be AC_CHECK_HEADERS([libavcodec/avcodec.h libavfilter/avfilter.h libavformat/avformat.h libavutil/avutil.h libpostproc/postprocess.h libswscale/swscale.h],, - [AC_CHECK_HEADERS([ffmpeg/avcodec.h ffmpeg/avfilter.h ffmpeg/avformat.h ffmpeg/avutil.h postproc/postprocess.h ffmpeg/swscale.h],, - [AC_MSG_ERROR($missing_headers)])]) + [AC_MSG_ERROR($missing_headers)]) # Check for libswresample or libavresample headers. AC_CHECK_HEADERS([libswresample/swresample.h libavresample/avresample.h]) diff --git a/lib/DllAvCodec.h b/lib/DllAvCodec.h index 09a5fddbc8..cf52a14c14 100644 --- a/lib/DllAvCodec.h +++ b/lib/DllAvCodec.h @@ -43,11 +43,7 @@ extern "C" { #endif #if (defined USE_EXTERNAL_FFMPEG) - #if (defined HAVE_LIBAVCODEC_AVCODEC_H) - #include <libavcodec/avcodec.h> - #elif (defined HAVE_FFMPEG_AVCODEC_H) - #include <ffmpeg/avcodec.h> - #endif + #include <libavcodec/avcodec.h> #else #include "libavcodec/avcodec.h" #endif diff --git a/lib/DllAvFilter.h b/lib/DllAvFilter.h index d44b9182de..11e92349c8 100644 --- a/lib/DllAvFilter.h +++ b/lib/DllAvFilter.h @@ -42,15 +42,9 @@ extern "C" { #endif #if (defined USE_EXTERNAL_FFMPEG) - #if (defined HAVE_LIBAVFILTER_AVFILTER_H) - #include <libavfilter/avfiltergraph.h> - #include <libavfilter/buffersink.h> - #include <libavfilter/avcodec.h> - #elif (defined HAVE_FFMPEG_AVFILTER_H) - #include <ffmpeg/avfiltergraph.h> - #include <ffmpeg/buffersink.h> - #include <ffmpeg/avcodec.h> - #endif + #include <libavfilter/avfiltergraph.h> + #include <libavfilter/buffersink.h> + #include <libavfilter/avcodec.h> #else #include "libavfilter/avfiltergraph.h" #include "libavfilter/buffersink.h" diff --git a/lib/DllAvFormat.h b/lib/DllAvFormat.h index 791dc01c0f..c3029db3b6 100644 --- a/lib/DllAvFormat.h +++ b/lib/DllAvFormat.h @@ -37,11 +37,7 @@ extern "C" { #pragma warning(disable:4244) #endif #if (defined USE_EXTERNAL_FFMPEG) - #if (defined HAVE_LIBAVFORMAT_AVFORMAT_H) - #include <libavformat/avformat.h> - #else - #include <ffmpeg/avformat.h> - #endif + #include <libavformat/avformat.h> /* xbmc_read_frame_flush() is defined for us in lib/xbmc-dll-symbols/DllAvFormat.c */ void xbmc_read_frame_flush(AVFormatContext *s); #else diff --git a/lib/DllAvUtil.h b/lib/DllAvUtil.h index 783ca2a92c..27f0b28c35 100644 --- a/lib/DllAvUtil.h +++ b/lib/DllAvUtil.h @@ -34,23 +34,13 @@ extern "C" { #if (defined USE_EXTERNAL_FFMPEG) - #if (defined HAVE_LIBAVUTIL_AVUTIL_H) - #include <libavutil/avutil.h> - // for av_get_default_channel_layout - #include <libavutil/audioconvert.h> - #include <libavutil/crc.h> - #include <libavutil/fifo.h> - // for LIBAVCODEC_VERSION_INT: - #include <libavcodec/avcodec.h> - #elif (defined HAVE_FFMPEG_AVUTIL_H) - #include <ffmpeg/avutil.h> - // for av_get_default_channel_layout - #include <ffmpeg/audioconvert.h> - #include <ffmpeg/crc.h> - #include <ffmpeg/fifo.h> - // for LIBAVCODEC_VERSION_INT: - #include <ffmpeg/avcodec.h> - #endif + #include <libavutil/avutil.h> + // for av_get_default_channel_layout + #include <libavutil/audioconvert.h> + #include <libavutil/crc.h> + #include <libavutil/fifo.h> + // for LIBAVCODEC_VERSION_INT: + #include <libavcodec/avcodec.h> // for enum AVSampleFormat #include <libavutil/samplefmt.h> #include <libavutil/opt.h> diff --git a/lib/DllPostProc.h b/lib/DllPostProc.h index 04115c578f..0797eb5c87 100644 --- a/lib/DllPostProc.h +++ b/lib/DllPostProc.h @@ -39,16 +39,8 @@ extern "C" { #endif #if (defined USE_EXTERNAL_FFMPEG) - #if (defined HAVE_LIBAVUTIL_AVUTIL_H) - #include <libavutil/avutil.h> - #elif (defined HAVE_FFMPEG_AVUTIL_H) - #include <ffmpeg/avutil.h> - #endif - #if (defined HAVE_LIBPOSTPROC_POSTPROCESS_H) - #include <libpostproc/postprocess.h> - #elif (defined HAVE_POSTPROC_POSTPROCESS_H) - #include <postproc/postprocess.h> - #endif + #include <libavutil/avutil.h> + #include <libpostproc/postprocess.h> #else #include "libavutil/avutil.h" #include "libpostproc/postprocess.h" diff --git a/lib/DllSwScale.h b/lib/DllSwScale.h index fd2ee57125..7e98bef32f 100644 --- a/lib/DllSwScale.h +++ b/lib/DllSwScale.h @@ -45,11 +45,7 @@ extern "C" { #endif #if (defined USE_EXTERNAL_FFMPEG) - #if (defined HAVE_LIBSWSCALE_SWSCALE_H) - #include <libswscale/swscale.h> - #elif (defined HAVE_FFMPEG_SWSCALE_H) - #include <ffmpeg/swscale.h> - #endif + #include <libswscale/swscale.h> #else #include "libswscale/swscale.h" #endif |