diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 22:59:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 22:59:41 +0400 |
| commit | 2b7ca2304a9b17568fac57a0bceba72b9c9ab580 (patch) | |
| tree | 0cb3492a7d6624bca9390375a5b20bd5b86f76d5 /intern/ffmpeg | |
| parent | 99d0ba6299d9f2acdf2446b2f52e812877ebcc70 (diff) | |
unify include guard defines, __$FILENAME__
without the underscores these clogged up the namespace for autocompleation which was annoying.
Diffstat (limited to 'intern/ffmpeg')
| -rw-r--r-- | intern/ffmpeg/ffmpeg_compat.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h index 582086d130b..bb2c4f2d0a4 100644 --- a/intern/ffmpeg/ffmpeg_compat.h +++ b/intern/ffmpeg/ffmpeg_compat.h @@ -1,8 +1,4 @@ -#ifndef __ffmpeg_compat_h_included__ -#define __ffmpeg_compat_h_included__ 1 - /* - * * compatibility macros to make every ffmpeg installation appear * like the most current installation (wrapping some functionality sometimes) * it also includes all ffmpeg header files at once, no need to do it @@ -22,10 +18,11 @@ * */ +#ifndef __FFMPEG_COMPAT_H__ +#define __FFMPEG_COMPAT_H__ #include <libavformat/avformat.h> - /* check our ffmpeg is new enough, avoids user complaints */ #if (LIBAVFORMAT_VERSION_MAJOR < 52) || ((LIBAVFORMAT_VERSION_MAJOR == 52) && (LIBAVFORMAT_VERSION_MINOR <= 64)) # error "FFmpeg 0.7 or newer is needed, Upgrade your FFmpeg or disable it" |