[FFmpeg-cvslog] avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()

Michael Niedermayer git at videolan.org
Thu May 7 01:50:21 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  7 01:21:42 2015 +0200| [bc6f84fff74131e869b72a10ac2efe8b745779a4] | committer: Michael Niedermayer

avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bc6f84fff74131e869b72a10ac2efe8b745779a4
---

 libavdevice/dshow_capture.h |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h
index ae2f1d3..b17da10 100644
--- 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)
 {



More information about the ffmpeg-cvslog mailing list