diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-07 01:21:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-07 01:49:54 +0200 |
| commit | bc6f84fff74131e869b72a10ac2efe8b745779a4 (patch) | |
| tree | a9df291f79ef5f28e0775637f43e572a06f123b6 /libavdevice/dshow_capture.h | |
| parent | 223a85985393ab6e9a71dab4a8877ed4ac15d82c (diff) | |
| download | ffmpeg-bc6f84fff74131e869b72a10ac2efe8b745779a4.tar.gz | |
avdevice/dshow_capture: avoid #ifdef, use ff_dlog() for dshowdebug()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/dshow_capture.h')
| -rw-r--r-- | libavdevice/dshow_capture.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavdevice/dshow_capture.h b/libavdevice/dshow_capture.h index ae2f1d3004..b17da10973 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) { |