[FFmpeg-cvslog] avcodec: Move STRIDE_ALIGN to internal.h

Michael Niedermayer git at videolan.org
Mon Mar 17 16:08:42 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 15 14:47:04 2014 +0100| [90d6b563fe815b7be7fb9ce675927b64d0ba3f34] | committer: Carl Eugen Hoyos

avcodec: Move STRIDE_ALIGN to internal.h

The next commit/bugfix will need it

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit da89572004f6c0279134d4c8c1c835496a2c4232)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90d6b563fe815b7be7fb9ce675927b64d0ba3f34
---

 libavcodec/internal.h |    6 ++++++
 libavcodec/utils.c    |    6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 8aa0ac1..d300dcd 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 40567f5..11b874f 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])
 {



More information about the ffmpeg-cvslog mailing list