FFmpeg: remove support for misplaced headers

This should have been gone since 0.5

diff --git a/configure.ac b/configure.ac
index ab7c1bdcca894644e25d522ec6a8e452bf2a07f0..7de376df248b664649741bdb814aa93906ac180d 100644 (file)
--- 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 473d0665bba4aad2bf1f6e3fa2590bde4254ee82..9cafc381c642a7ee5834f0a6cd451b9431984c02 100644 (file)
--- 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 9805ff1d8464b7e66ea75d17d871f30409f2668c..3d4edb77c789dc49bcf6ad5910786b05e6b5d853 100644 (file)
--- 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 9006346e08204dbe3e6d22b6ad3d6691ebc18c60..fa396ef57a2c1ba38a6c0bd05d92c7b99a7ac0f8 100644 (file)
--- 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 f912ee39e6bb7db0bfb4132b72d7a32b2458749b..595f1d667b2d31beed2b96cfe074e5a60e423580 100644 (file)
--- 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 e2b36f8e50ac0f5f2e7dc7935e9954f87854523a..b626e47aa657f4e84c3e5bce96053a5160401c43 100644 (file)
--- 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 45c4b93985e80a538446bd84421f7a1bd8797997..6cba8236a6faf58c6c1c98b935561b6750bbd085 100644 (file)
--- 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 255243971bf14e4b70f8b198db9ddfc8fbff7ebb..e5b9e6a89e80a87eff4f3ec9c6f20316e030c671 100644 (file)
--- 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 4b64bf57e584b2916f4e52a2d1dadefa1b9c07b9..710fddd1d1a5898c07142b579fb05e650b1cf983 100644 (file)
--- 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 69d81081d7e0a7ab4b31d84cbeaa74054148dc5d..db8f020fd49f402e75ee7cdd7382a14a223659ce 100644 (file)
--- 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 af69662b8ad735407ef986819f16df197e2c904e..19f49c8602d9b99d963758238ff16aa952db35f7 100644 (file)
--- 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 b60c5f62162b909885796f0b9d0c94b063ba1ac5..bafb2a4b29f2bf37b6242c104496f41f65862a5e 100644 (file)
--- 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