mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-19 13:04:51 +02:00
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>
This commit is contained in:
commit
3d842cf827
@ -184,7 +184,7 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
|
|||||||
s->height = FF_CEIL_RSHIFT(height, s->lowres);
|
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
|
# define STRIDE_ALIGN 16
|
||||||
#else
|
#else
|
||||||
# define STRIDE_ALIGN 8
|
# define STRIDE_ALIGN 8
|
||||||
|
Loading…
Reference in New Issue
Block a user