har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dsputil: Move STRIDE_ALIGN macro to the only place it is used

Browse Source
This commit is contained in:
Diego Biurrun 2013-02-08 15:55:52 +01:00
parent 157542ebc1
commit c6507946d4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/dsputil.h
View File

@ -397,10 +397,4 @@ void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx);
void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx);
void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx);
#if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMX
# define STRIDE_ALIGN 16
#else
# define STRIDE_ALIGN 8
#endif
#endif /* AVCODEC_DSPUTIL_H */ #endif /* AVCODEC_DSPUTIL_H */

7
libavcodec/utils.c
View File

@ -25,6 +25,7 @@
* utils. * utils.
*/ */
#include "config.h"
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/channel_layout.h" #include "libavutil/channel_layout.h"
@ -156,6 +157,12 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height)
#define INTERNAL_BUFFER_SIZE (32 + 1) #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, void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
int linesize_align[AV_NUM_DATA_POINTERS]) int linesize_align[AV_NUM_DATA_POINTERS])
{ {