[FFmpeg-cvslog] avcodec/vp9: fix () in macros

Michael Niedermayer git at videolan.org
Wed Jun 18 03:21:33 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 02:55:35 2014 +0200| [aab23f5ddd3d25feb300049683437d9c1cd6336c] | committer: Michael Niedermayer

avcodec/vp9: fix () in macros

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/vp9.c    |    2 +-
 libavcodec/vp9dsp.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index 000e991..56975bd 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -325,7 +325,7 @@ static int update_size(AVCodecContext *ctx, int w, int h)
     s->cols     = (w + 7) >> 3;
     s->rows     = (h + 7) >> 3;
 
-#define assign(var, type, n) var = (type) p; p += s->sb_cols * n * sizeof(*var)
+#define assign(var, type, n) var = (type) p; p += s->sb_cols * (n) * sizeof(*var)
     av_freep(&s->intra_pred_data[0]);
     p = av_malloc(s->sb_cols * (240 + sizeof(*s->lflvl) + 16 * sizeof(*s->above_mv_ctx)));
     if (!p)
diff --git a/libavcodec/vp9dsp.c b/libavcodec/vp9dsp.c
index e2f99f7..6356add 100644
--- a/libavcodec/vp9dsp.c
+++ b/libavcodec/vp9dsp.c
@@ -896,7 +896,7 @@ itxfm_wrapper(iadst, idct,  sz, bits, 0) \
 itxfm_wrapper(idct,  iadst, sz, bits, 0) \
 itxfm_wrapper(iadst, iadst, sz, bits, 0)
 
-#define IN(x) in[x * stride]
+#define IN(x) in[(x) * stride]
 
 static av_always_inline void idct4_1d(const int16_t *in, ptrdiff_t stride,
                                       int16_t *out, int pass)



More information about the ffmpeg-cvslog mailing list