vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Thu Aug 16 17:07:51 2012 +0200| [dc4db7148fb13ee77c0821c5ee2d5f74fd05cfc2] | committer: Jean-Baptiste Kempf
Avcodec: use the standard includes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dc4db7148fb13ee77c0821c5ee2d5f74fd05cfc2 --- modules/codec/avcodec/audio.c | 6 +----- modules/codec/avcodec/avcodec.c | 6 +----- modules/codec/avcodec/cpu.c | 6 +----- modules/codec/avcodec/deinterlace.c | 6 +----- modules/codec/avcodec/dxva2.c | 14 +++++--------- modules/codec/avcodec/encoder.c | 6 +----- modules/codec/avcodec/fourcc.c | 6 +----- modules/codec/avcodec/subtitle.c | 10 +++------- modules/codec/avcodec/vaapi.c | 6 +----- modules/codec/avcodec/video.c | 24 +++++++++--------------- 10 files changed, 24 insertions(+), 66 deletions(-) diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c index 0c75a5d..65c5da7 100644 --- a/modules/codec/avcodec/audio.c +++ b/modules/codec/avcodec/audio.c @@ -35,11 +35,7 @@ #include <vlc_avcodec.h> /* ffmpeg header */ -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -#else -# include <avcodec.h> -#endif +#include <libavcodec/avcodec.h> #if LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0) # include "libavutil/audioconvert.h" diff --git a/modules/codec/avcodec/avcodec.c b/modules/codec/avcodec/avcodec.c index 237b114..4cb1354 100644 --- a/modules/codec/avcodec/avcodec.c +++ b/modules/codec/avcodec/avcodec.c @@ -37,11 +37,7 @@ /* ffmpeg header */ #define HAVE_MMX 1 -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -#else -# include <avcodec.h> -#endif +#include <libavcodec/avcodec.h> #include "avcodec.h" #include "chroma.h" diff --git a/modules/codec/avcodec/cpu.c b/modules/codec/avcodec/cpu.c index 3dfb26c..97d795f 100644 --- a/modules/codec/avcodec/cpu.c +++ b/modules/codec/avcodec/cpu.c @@ -26,11 +26,7 @@ #include <vlc_cpu.h> #define HAVE_MMX 1 -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -#else -# include <avcodec.h> -#endif +#include <libavcodec/avcodec.h> #include "avcodec.h" /** diff --git a/modules/codec/avcodec/deinterlace.c b/modules/codec/avcodec/deinterlace.c index 4443668..f2336ff 100644 --- a/modules/codec/avcodec/deinterlace.c +++ b/modules/codec/avcodec/deinterlace.c @@ -34,11 +34,7 @@ #include <vlc_filter.h> /* ffmpeg header */ -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -#else -# include <avcodec.h> -#endif +#include <libavcodec/avcodec.h> #include "avcodec.h" #include "avcommon.h" diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c index cb79319..5d3424a 100644 --- a/modules/codec/avcodec/dxva2.c +++ b/modules/codec/avcodec/dxva2.c @@ -42,15 +42,11 @@ #include <vlc_cpu.h> #include <assert.h> -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -# ifdef HAVE_AVCODEC_DXVA2 -# define DXVA2API_USE_BITFIELDS -# define COBJMACROS -# include <libavcodec/dxva2.h> -# endif -#else -# include <avcodec.h> +#include <libavcodec/avcodec.h> +#ifdef HAVE_AVCODEC_DXVA2 +# define DXVA2API_USE_BITFIELDS +# define COBJMACROS +# include <libavcodec/dxva2.h> #endif #include "avcodec.h" diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c index ae1de3b..f4055fa 100644 --- a/modules/codec/avcodec/encoder.c +++ b/modules/codec/avcodec/encoder.c @@ -42,11 +42,7 @@ /* ffmpeg header */ #define HAVE_MMX 1 -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -#else -# include <avcodec.h> -#endif +#include <libavcodec/avcodec.h> #include "avcodec.h" #include "avcommon.h" diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c index ad61157..33cd007 100644 --- a/modules/codec/avcodec/fourcc.c +++ b/modules/codec/avcodec/fourcc.c @@ -29,11 +29,7 @@ #include <vlc_common.h> #include <vlc_codec.h> -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -#else -# include <avcodec.h> -#endif +#include <libavcodec/avcodec.h> #include "avcodec.h" /***************************************************************************** diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c index 8e75f4d..f757ad5 100644 --- a/modules/codec/avcodec/subtitle.c +++ b/modules/codec/avcodec/subtitle.c @@ -34,13 +34,9 @@ #include <vlc_avcodec.h> /* ffmpeg header */ -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -# ifdef HAVE_AVCODEC_VAAPI -# include <libavcodec/vaapi.h> -# endif -#else -# include <avcodec.h> +#include <libavcodec/avcodec.h> +#ifdef HAVE_AVCODEC_VAAPI +# include <libavcodec/vaapi.h> #endif #include "avcodec.h" diff --git a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c index 6070260..9754ba1 100644 --- a/modules/codec/avcodec/vaapi.c +++ b/modules/codec/avcodec/vaapi.c @@ -29,11 +29,7 @@ #include <vlc_fourcc.h> #include <assert.h> -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -#else -# include <avcodec.h> -#endif +#include <libavcodec/avcodec.h> #include "avcodec.h" #include "va.h" diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index b2e4271..ba9be4c 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -44,21 +44,15 @@ #include <assert.h> /* ffmpeg header */ -#ifdef HAVE_LIBAVCODEC_AVCODEC_H -# include <libavcodec/avcodec.h> -# ifdef HAVE_AVCODEC_VAAPI -# include <libavcodec/vaapi.h> -# endif -# ifdef HAVE_AVCODEC_DXVA2 -# include <libavcodec/dxva2.h> -# endif -# ifdef HAVE_AVCODEC_VDA -# include <libavcodec/vda.h> -# endif -#elif defined(HAVE_FFMPEG_AVCODEC_H) -# include <ffmpeg/avcodec.h> -#else -# include <avcodec.h> +#include <libavcodec/avcodec.h> +#ifdef HAVE_AVCODEC_VAAPI +# include <libavcodec/vaapi.h> +#endif +#ifdef HAVE_AVCODEC_DXVA2 +# include <libavcodec/dxva2.h> +#endif +#ifdef HAVE_AVCODEC_VDA +# include <libavcodec/vda.h> #endif #include "avcodec.h" _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
