Merge commit 'fa1923f18205410a3b0aa6c0e77cb31443ef340d'

[ffmpeg] / libavdevice / dshow_capture.h

diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h
index ae2f1d300427dffb134912a34a77849cc5818014..b17da1097311462750d66f9813e873926264ae9c 100644 (file)
--- a/libavdevice/dshow_capture.h
+++ b/libavdevice/dshow_capture.h
@@ -33,6 +33,8 @@
 #include <dshow.h>
 #include <dvdmedia.h>
 
+#include "libavcodec/internal.h"
+
 /* EC_DEVICE_LOST is not defined in MinGW dshow headers. */
 #ifndef EC_DEVICE_LOST
 #define EC_DEVICE_LOST 0x1f
@@ -44,12 +46,8 @@ void ff_print_AUDIO_STREAM_CONFIG_CAPS(const AUDIO_STREAM_CONFIG_CAPS *caps);
 void ff_print_AM_MEDIA_TYPE(const AM_MEDIA_TYPE *type);
 void ff_printGUID(const GUID *g);
 
-#if DSHOWDEBUG
 extern const AVClass *ff_dshow_context_class_ptr;
-#define dshowdebug(...) av_log(&ff_dshow_context_class_ptr, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-#define dshowdebug(...)
-#endif
+#define dshowdebug(...) ff_dlog(&ff_dshow_context_class_ptr, __VA_ARGS__)
 
 static inline void nothing(void *foo)
 {