[vlc-commits] FFmpeg: remove support for misplaced headers
Jean-Baptiste Kempf
git at videolan.org
Wed Mar 16 23:37:25 CET 2011
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Mar 16 23:31:24 2011 +0100| [d1a04e1f3bc5fafe3cfcc48ccc49e72d43b2d891] | committer: Jean-Baptiste Kempf
FFmpeg: remove support for misplaced headers
This should have been gone since 0.5
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d1a04e1f3bc5fafe3cfcc48ccc49e72d43b2d891
---
configure.ac | 10 +++++-----
modules/codec/avcodec/audio.c | 2 --
modules/codec/avcodec/avcodec.c | 2 --
modules/codec/avcodec/deinterlace.c | 2 --
modules/codec/avcodec/dxva2.c | 2 --
modules/codec/avcodec/encoder.c | 2 --
modules/codec/avcodec/fourcc.c | 2 --
modules/codec/avcodec/subtitle.c | 2 --
modules/codec/avcodec/vaapi.c | 2 --
modules/demux/avformat/demux.c | 7 +------
modules/demux/avformat/mux.c | 7 +------
modules/video_filter/swscale.c | 6 +-----
12 files changed, 8 insertions(+), 38 deletions(-)
diff --git a/configure.ac b/configure.ac
index ab7c1bd..7de376d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2473,8 +2473,8 @@ AS_IF([test "${enable_avcodec}" != "no"], [
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"
CFLAGS="${CFLAGS} ${AVCODEC_CFLAGS}"
- AC_CHECK_HEADERS(libavcodec/avcodec.h ffmpeg/avcodec.h)
- AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
+ AC_CHECK_HEADERS(libavcodec/avcodec.h)
+ AC_CHECK_HEADERS(libavutil/avutil.h)
VLC_ADD_PLUGIN([avcodec])
VLC_ADD_LIBS([avcodec],[$AVCODEC_LIBS])
AS_IF([test "${ac_cv_ld_bsymbolic}" != "no"], [
@@ -2590,8 +2590,8 @@ then
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVFORMAT_CFLAGS}"
CFLAGS="${CFLAGS} ${AVFORMAT_CFLAGS}"
- AC_CHECK_HEADERS(libavformat/avformat.h ffmpeg/avformat.h libavformat/avio.h)
- AC_CHECK_HEADERS(libavutil/avutil.h ffmpeg/avutil.h)
+ AC_CHECK_HEADERS(libavformat/avformat.h libavformat/avio.h)
+ AC_CHECK_HEADERS(libavutil/avutil.h)
AS_IF([test "$enable_merge_ffmpeg" = "no"], [
VLC_ADD_PLUGIN([avformat access_avio])
VLC_ADD_LIBS([avformat access_avio],[$AVFORMAT_LIBS $AVUTIL_LIBS])
@@ -2623,7 +2623,7 @@ then
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${SWSCALE_CFLAGS}"
CFLAGS="${CFLAGS} ${SWSCALE_CFLAGS}"
- AC_CHECK_HEADERS(libswscale/swscale.h ffmpeg/swscale.h)
+ AC_CHECK_HEADERS(libswscale/swscale.h)
VLC_ADD_PLUGIN([swscale])
VLC_ADD_LIBS([swscale],[$SWSCALE_LIBS])
VLC_ADD_CFLAGS([swscale],[$SWSCALE_CFLAGS])
diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 473d066..9cafc38 100644
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -37,8 +37,6 @@
/* ffmpeg header */
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c
index 9805ff1..3d4edb7 100644
--- a/modules/codec/avcodec/avcodec.c
+++ b/modules/codec/avcodec/avcodec.c
@@ -39,8 +39,6 @@
#define HAVE_MMX 1
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
diff --git a/modules/codec/avcodec/deinterlace.c b/modules/codec/avcodec/deinterlace.c
index 9006346..fa396ef 100644
--- a/modules/codec/avcodec/deinterlace.c
+++ b/modules/codec/avcodec/deinterlace.c
@@ -36,8 +36,6 @@
/* ffmpeg header */
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index f912ee3..595f1d6 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -39,8 +39,6 @@
# define DXVA2API_USE_BITFIELDS
# include <libavcodec/dxva2.h>
# endif
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c
index e2b36f8..b626e47 100644
--- a/modules/codec/avcodec/encoder.c
+++ b/modules/codec/avcodec/encoder.c
@@ -44,8 +44,6 @@
#define HAVE_MMX 1
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 45c4b93..6cba823 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -31,8 +31,6 @@
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index 2552439..e5b9e6a 100644
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -39,8 +39,6 @@
# ifdef HAVE_AVCODEC_VAAPI
# include <libavcodec/vaapi.h>
# endif
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c
index 4b64bf5..710fddd 100644
--- a/modules/codec/avcodec/vaapi.c
+++ b/modules/codec/avcodec/vaapi.c
@@ -31,8 +31,6 @@
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
index 69d8108..db8f020 100644
--- a/modules/demux/avformat/demux.c
+++ b/modules/demux/avformat/demux.c
@@ -38,12 +38,7 @@
#include <vlc_charset.h>
#include <vlc_avcodec.h>
-/* ffmpeg header */
-#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
-# include <libavformat/avformat.h>
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-# include <ffmpeg/avformat.h>
-#endif
+#include <libavformat/avformat.h>
#include "../../codec/avcodec/avcodec.h"
#include "../../codec/avcodec/chroma.h"
diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index af69662..19f49c8 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -33,12 +33,7 @@
#include <vlc_block.h>
#include <vlc_sout.h>
-/* ffmpeg header */
-#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-# include <libavformat/avformat.h>
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-# include <ffmpeg/avformat.h>
-#endif
+#include <libavformat/avformat.h>
#include "avformat.h"
#include "../../codec/avcodec/avcodec.h"
diff --git a/modules/video_filter/swscale.c b/modules/video_filter/swscale.c
index b60c5f6..bafb2a4 100644
--- a/modules/video_filter/swscale.c
+++ b/modules/video_filter/swscale.c
@@ -35,11 +35,7 @@
#include <vlc_filter.h>
#include <vlc_cpu.h>
-#ifdef HAVE_LIBSWSCALE_SWSCALE_H
-# include <libswscale/swscale.h>
-#elif defined(HAVE_FFMPEG_SWSCALE_H)
-# include <ffmpeg/swscale.h>
-#endif
+#include <libswscale/swscale.h>
#include "../codec/avcodec/chroma.h" // Chroma Avutil <-> VLC conversion
More information about the vlc-commits
mailing list