diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 13:08:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-21 13:08:55 +0200 |
| commit | 3d842cf8273f4f67eed410d0cfe015010963fea9 (patch) | |
| tree | 46fe81a82107f230ea6b4275ef4080aff21f4f38 /libavcodec | |
| parent | 70a73213b787268b9fdfc92ed418ad9802992b10 (diff) | |
| parent | e95930eda18e90eaea30fd397ea21b30f7763137 (diff) | |
| download | ffmpeg-3d842cf8273f4f67eed410d0cfe015010963fea9.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec/utils: Simplify a condition that combines HAVE_NEON and ARCH_ARM
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 3ae4af6a9e..0be9340253 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -184,7 +184,7 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height) s->height = FF_CEIL_RSHIFT(height, s->lowres); } -#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX +#if HAVE_NEON || ARCH_PPC || HAVE_MMX # define STRIDE_ALIGN 16 #else # define STRIDE_ALIGN 8 |