diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 11:00:22 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-14 11:00:22 +0100 |
commit | 8bbb487e443a7979f223759a5d6c2d7662a5948d (patch) | |
tree | dfcc859ca0fb087b36c4f7961f6e9e252fea7fdd /libavcodec/dsputil.h | |
parent | 9f16cb9e50a5a196af9244dc7d33ed193227528a (diff) | |
parent | 130cefc9dcedea5babc349251fbeec6f037144ac (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/platform: Fix 10l typo
dsputil: Move STRIDE_ALIGN macro to the only place it is used
Conflicts:
libavcodec/dsputil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
-rw-r--r-- | libavcodec/dsputil.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index b27e5a62d6..7d12fe3c7b 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -404,10 +404,4 @@ void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_dwt(DSPContext *c); -#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX -# define STRIDE_ALIGN 16 -#else -# define STRIDE_ALIGN 8 -#endif - #endif /* AVCODEC_DSPUTIL_H */ |