diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-15 14:47:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-15 14:56:42 +0100 |
| commit | da89572004f6c0279134d4c8c1c835496a2c4232 (patch) | |
| tree | 9b100b7bb3c27092c6aceae6ac4cac315062b9c7 | |
| parent | 847d8af59af5925fb4310256bd63bc54d9cee7b5 (diff) | |
| download | ffmpeg-da89572004f6c0279134d4c8c1c835496a2c4232.tar.gz | |
avcodec: Move STRIDE_ALIGN to internal.h
The next commit/bugfix will need it
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/internal.h | 6 | ||||
| -rw-r--r-- | libavcodec/utils.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 6d3cdcdaaa..0da2fa4fb7 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -35,6 +35,12 @@ #define FF_SANE_NB_CHANNELS 63U +#if HAVE_NEON || ARCH_PPC || HAVE_MMX +# define STRIDE_ALIGN 16 +#else +# define STRIDE_ALIGN 8 +#endif + typedef struct FramePool { /** * Pools for each data plane. For audio all the planes have the same size, diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 40567f51d3..11b874f764 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -274,12 +274,6 @@ int ff_side_data_update_matrix_encoding(AVFrame *frame, return 0; } -#if 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]) { |