diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 12:55:56 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-12 12:55:56 +0400 |
| commit | be5389d58521514ab3cd428977a00834f375b9ee (patch) | |
| tree | 59da1dd5b8a4b09a79bec16e089a687f62ef97cb /libavcodec/dsputil.h | |
| parent | 9138f6da4a3ee0d11947b8593db6b6b05e53fbae (diff) | |
| parent | e70c5b034c4787377e82cab2d5565486baec0c2a (diff) | |
Merge commit 'e70c5b034c4787377e82cab2d5565486baec0c2a'
* commit 'e70c5b034c4787377e82cab2d5565486baec0c2a':
swfdec: do better validation of tag length
Make LOCAL_ALIGNED syntactically similar on all systems
Conflicts:
libavformat/swfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
| -rw-r--r-- | libavcodec/dsputil.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 4c900a023e..44d2f08e39 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -622,7 +622,9 @@ void ff_dsputil_init_dwt(DSPContext *c); uint8_t la_##v[sizeof(t s o) + (a)]; \ t (*v) o = (void *)FFALIGN((uintptr_t)la_##v, a) -#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) DECLARE_ALIGNED(a, t, v) s o +#define LOCAL_ALIGNED_D(a, t, v, s, o, ...) \ + 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__,,)) |