[vlc-commits] Do not include <vlc_es.h> from <vlc_fourcc.h>
Rémi Denis-Courmont
git at videolan.org
Sat Jul 16 11:53:44 CEST 2011
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jul 16 10:55:39 2011 +0300| [61d342e12e8415f4b509b623eb8142f509725d17] | committer: Rémi Denis-Courmont
Do not include <vlc_es.h> from <vlc_fourcc.h>
<vlc_es.h> includes <vlc_fourcc.h> already
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=61d342e12e8415f4b509b623eb8142f509725d17
---
include/vlc_fourcc.h | 1 -
src/misc/fourcc.c | 2 ++
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 8c5b176..9aebbba 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -25,7 +25,6 @@
#define VLC_FOURCC_H 1
#include <vlc_common.h>
-#include <vlc_es.h>
/* Video codec */
#define VLC_CODEC_MPGV VLC_FOURCC('m','p','g','v')
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index cea64fe..9293335 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -28,7 +28,9 @@
# include "config.h"
#endif
+#include <vlc_common.h>
#include <vlc_fourcc.h>
+#include <vlc_es.h>
#include <assert.h>
typedef struct
More information about the vlc-commits
mailing list