[vlc-commits] avcodec: useless #include
Rémi Denis-Courmont
git at videolan.org
Fri Oct 12 10:38:15 CEST 2012
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Oct 10 17:43:29 2012 +0300| [fb1046c3f7fe8b56b3f32ba780c00119f40fd805] | committer: Rémi Denis-Courmont
avcodec: useless #include
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=fb1046c3f7fe8b56b3f32ba780c00119f40fd805
---
modules/codec/avcodec/subtitle.c | 3 ---
modules/codec/avcodec/video.c | 17 -----------------
2 files changed, 20 deletions(-)
diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index d6ff17d..f38243f 100644
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -35,9 +35,6 @@
#include <libavcodec/avcodec.h>
#include <libavutil/mem.h>
-#ifdef HAVE_AVCODEC_VAAPI
-# include <libavcodec/vaapi.h>
-#endif
#include "avcodec.h"
diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index e95977e..4be900d 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -29,14 +29,6 @@
# include "config.h"
#endif
-#if defined(HAVE_LIBAVCODEC_AVCODEC_H) && defined(HAVE_AVCODEC_DXVA2)
-# if _WIN32_WINNT < 0x600
-/* dxva2 needs Vista support */
-# undef _WIN32_WINNT
-# define _WIN32_WINNT 0x600
-# endif
-#endif
-
#include <vlc_common.h>
#include <vlc_codec.h>
#include <vlc_avcodec.h>
@@ -45,15 +37,6 @@
#include <libavcodec/avcodec.h>
#include <libavutil/mem.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"
#include "va.h"
More information about the vlc-commits
mailing list