Zebediah Figura : winegstreamer: Remove some redundant includes.
Alexandre Julliard
julliard at winehq.org
Tue Feb 23 15:54:46 CST 2021
Module: wine
Branch: master
Commit: 18b6115d53b7da0741d40cad05bb1066676911d7
URL: https://source.winehq.org/git/wine.git/?a=commit;h=18b6115d53b7da0741d40cad05bb1066676911d7
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Feb 22 16:53:47 2021 -0600
winegstreamer: Remove some redundant includes.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winegstreamer/audioconvert.c | 1 -
dlls/winegstreamer/gst_private.h | 8 ++------
dlls/winegstreamer/gstdemux.c | 5 -----
dlls/winegstreamer/main.c | 1 -
dlls/winegstreamer/media_source.c | 10 ----------
dlls/winegstreamer/mfplat.c | 5 -----
dlls/winegstreamer/wg_parser.c | 1 -
7 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/dlls/winegstreamer/audioconvert.c b/dlls/winegstreamer/audioconvert.c
index 304e1c8b067..33350fb3566 100644
--- a/dlls/winegstreamer/audioconvert.c
+++ b/dlls/winegstreamer/audioconvert.c
@@ -21,7 +21,6 @@
#include "mfapi.h"
#include "mferror.h"
-#include "mfidl.h"
#include "ks.h"
#include "ksmedia.h"
diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h
index 3a5445a27ce..55a62361966 100644
--- a/dlls/winegstreamer/gst_private.h
+++ b/dlls/winegstreamer/gst_private.h
@@ -21,6 +21,7 @@
#ifndef __GST_PRIVATE_INCLUDED__
#define __GST_PRIVATE_INCLUDED__
+#include <assert.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stdint.h>
@@ -29,13 +30,8 @@
#define COBJMACROS
#define NONAMELESSSTRUCT
#define NONAMELESSUNION
-#include "windef.h"
-#include "winbase.h"
-#include "wtypes.h"
-#include "winuser.h"
#include "dshow.h"
-#include "strmif.h"
-#include "mfobjects.h"
+#include "mfidl.h"
#include "wine/debug.h"
#include "wine/strmbase.h"
diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c
index 985183b0a35..e9e7c3a0f9f 100644
--- a/dlls/winegstreamer/gstdemux.c
+++ b/dlls/winegstreamer/gstdemux.c
@@ -23,14 +23,9 @@
#include "gst_private.h"
#include "gst_guids.h"
-#include "vfwmsgs.h"
#include "amvideo.h"
-#include "wine/debug.h"
-
-#include <assert.h>
#include <limits.h>
-
#include "dvdmedia.h"
#include "mmreg.h"
#include "ks.h"
diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c
index ae26745773b..d5c06bf3279 100644
--- a/dlls/winegstreamer/main.c
+++ b/dlls/winegstreamer/main.c
@@ -21,7 +21,6 @@
#include "gst_private.h"
#include "winternl.h"
#include "rpcproxy.h"
-#include "wine/debug.h"
#include "initguid.h"
#include "gst_guids.h"
diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c
index f72b4ff2fd0..3260175f45a 100644
--- a/dlls/winegstreamer/media_source.c
+++ b/dlls/winegstreamer/media_source.c
@@ -20,19 +20,9 @@
#include "gst_private.h"
-#include <assert.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#define COBJMACROS
-#define NONAMELESSUNION
-
#include "mfapi.h"
#include "mferror.h"
-#include "mfidl.h"
-#include "mfobjects.h"
-#include "wine/debug.h"
#include "wine/list.h"
WINE_DEFAULT_DEBUG_CHANNEL(mfplat);
diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c
index e6913d099b0..602fa631a43 100644
--- a/dlls/winegstreamer/mfplat.c
+++ b/dlls/winegstreamer/mfplat.c
@@ -19,12 +19,7 @@
#include "gst_private.h"
-#include <assert.h>
-#include <stdarg.h>
-
-#include "gst_private.h"
#include "mfapi.h"
-#include "mfidl.h"
#include "ks.h"
#include "ksmedia.h"
diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index a7b3e6348cf..94f677538c7 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -30,7 +30,6 @@
#include "gst_private.h"
#include "winternl.h"
-#include <assert.h>
#include <gst/gst.h>
#include <gst/video/video.h>
#include <gst/audio/audio.h>
More information about the wine-cvs
mailing list