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/utils.c | |
| 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/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 0844b249ee..569f2ff6e4 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -25,6 +25,7 @@ * utils. */ +#include "config.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" @@ -177,6 +178,12 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height) #define INTERNAL_BUFFER_SIZE (32 + 1) +#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX +# define STRIDE_ALIGN 16 +#else +# define STRIDE_ALIGN 8 +#endif + void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height, int linesize_align[AV_NUM_DATA_POINTERS]) { |