generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec: Move STRIDE_ALIGN to internal.h

Browse Source 
The next commit/bugfix will need it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit da89572004)
This commit is contained in:
Michael Niedermayer
2014-03-15 14:47:04 +01:00
committed by Carl Eugen Hoyos
parent dce2f820e9
commit 90d6b563fe
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/internal.h
View File

@@ -35,6 +35,12 @@
#define FF_SANE_NB_CHANNELS 63U #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 { typedef struct FramePool {
/** /**
* Pools for each data plane. For audio all the planes have the same size, * Pools for each data plane. For audio all the planes have the same size,

6
libavcodec/utils.c
View File

@@ -274,12 +274,6 @@ int ff_side_data_update_matrix_encoding(AVFrame *frame,
return 0; 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, void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
int linesize_align[AV_NUM_DATA_POINTERS]) int linesize_align[AV_NUM_DATA_POINTERS])
{ {