diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-02-09 22:37:07 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-02-12 11:47:43 +0100 |
| commit | fd1abf42693308ff99b9473c2387d5142f8b3f0e (patch) | |
| tree | a62248872128ceeba7ad99ddb5e02c796498bc8f /libavutil/internal.h | |
| parent | 3658d2dfd48a764503f1bb43edabef0c8af4d8d9 (diff) | |
| download | ffmpeg-fd1abf42693308ff99b9473c2387d5142f8b3f0e.tar.gz | |
lavu: avoid clashing definition of E
E is usually defined as a shorthand for AV_OPT_FLAG_ENCODING_PARAM.
Rename the single expansion E(x) now used in libavutil to E1.
Diffstat (limited to 'libavutil/internal.h')
| -rw-r--r-- | libavutil/internal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index 43cbaeaca2..cf18bdb700 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -59,7 +59,7 @@ // Some broken preprocessors need a second expansion // to be forced to tokenize __VA_ARGS__ -#define E(x) x +#define E1(x) x #define LOCAL_ALIGNED_A(a, t, v, s, o, ...) \ uint8_t la_##v[sizeof(t s o) + (a)]; \ @@ -69,16 +69,16 @@ DECLARE_ALIGNED(a, t, la_##v) s o; \ t (*v) o = la_##v -#define LOCAL_ALIGNED(a, t, v, ...) E(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,)) +#define LOCAL_ALIGNED(a, t, v, ...) E1(LOCAL_ALIGNED_A(a, t, v, __VA_ARGS__,,)) #if HAVE_LOCAL_ALIGNED_8 -# define LOCAL_ALIGNED_8(t, v, ...) E(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) +# define LOCAL_ALIGNED_8(t, v, ...) E1(LOCAL_ALIGNED_D(8, t, v, __VA_ARGS__,,)) #else # define LOCAL_ALIGNED_8(t, v, ...) LOCAL_ALIGNED(8, t, v, __VA_ARGS__) #endif #if HAVE_LOCAL_ALIGNED_16 -# define LOCAL_ALIGNED_16(t, v, ...) E(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) +# define LOCAL_ALIGNED_16(t, v, ...) E1(LOCAL_ALIGNED_D(16, t, v, __VA_ARGS__,,)) #else # define LOCAL_ALIGNED_16(t, v, ...) LOCAL_ALIGNED(16, t, v, __VA_ARGS__) #endif |