From: "Ronald S. Bultje" <[email protected]>
---
libavcodec/dsputil.c | 2 +-
libavcodec/dsputil.h | 2 +-
libavcodec/vc1dec.c | 2 +-
libavcodec/x86/dsputil_mmx.c | 22 +++++++++++-----------
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index a306583..75d3ad6 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2705,7 +2705,7 @@ av_cold void ff_dsputil_init(DSPContext* c,
AVCodecContext *avctx)
hpel_funcs(avg, [1], 8);
hpel_funcs(avg, [2], 4);
hpel_funcs(avg, [3], 2);
- hpel_funcs(avg_no_rnd,[0], 16);
+ hpel_funcs(avg_no_rnd,, 16);
#undef FUNC
#undef FUNCC
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index e4bbd46..1903abb 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -289,7 +289,7 @@ typedef struct DSPContext {
* @param line_size number of bytes in a horizontal line of block
* @param h height
*/
- op_pixels_func avg_no_rnd_pixels_tab[1][4];
+ op_pixels_func avg_no_rnd_pixels_tab[4];
/**
* Thirdpel motion compensation with rounding (a+b+1)>>1.
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 8e7b0ea..843c2fb 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -1949,7 +1949,7 @@ static void vc1_interp_mc(VC1Context *v)
if (!v->rnd)
dsp->avg_pixels_tab[0][dxy](s->dest[0] + off, srcY, s->linesize,
16);
else
- dsp->avg_no_rnd_pixels_tab[0][dxy](s->dest[0] + off, srcY,
s->linesize, 16);
+ dsp->avg_no_rnd_pixels_tab[dxy](s->dest[0] + off, srcY,
s->linesize, 16);
}
if (s->flags & CODEC_FLAG_GRAY) return;
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 6a0203c..8f8d176 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -1876,10 +1876,10 @@ void ff_vector_clip_int32_sse4 (int32_t *dst, const
int32_t *src,
#define SET_HPEL_FUNCS(PFX, IDX, SIZE, CPU)
\
do {
\
- c->PFX ## _pixels_tab[IDX][0] = PFX ## _pixels ## SIZE ## _ ##
CPU; \
- c->PFX ## _pixels_tab[IDX][1] = PFX ## _pixels ## SIZE ## _x2_ ##
CPU; \
- c->PFX ## _pixels_tab[IDX][2] = PFX ## _pixels ## SIZE ## _y2_ ##
CPU; \
- c->PFX ## _pixels_tab[IDX][3] = PFX ## _pixels ## SIZE ## _xy2_ ##
CPU; \
+ c->PFX ## _pixels_tab IDX [0] = PFX ## _pixels ## SIZE ## _ ##
CPU; \
+ c->PFX ## _pixels_tab IDX [1] = PFX ## _pixels ## SIZE ## _x2_ ##
CPU; \
+ c->PFX ## _pixels_tab IDX [2] = PFX ## _pixels ## SIZE ## _y2_ ##
CPU; \
+ c->PFX ## _pixels_tab IDX [3] = PFX ## _pixels ## SIZE ## _xy2_ ##
CPU; \
} while (0)
#define H264_QPEL_FUNCS(x, y, CPU)
\
@@ -1912,13 +1912,13 @@ static void dsputil_init_mmx(DSPContext *c,
AVCodecContext *avctx, int mm_flags)
c->clear_blocks = clear_blocks_mmx;
c->draw_edges = draw_edges_mmx;
- SET_HPEL_FUNCS(put, 0, 16, mmx);
- SET_HPEL_FUNCS(put_no_rnd, 0, 16, mmx);
- SET_HPEL_FUNCS(avg, 0, 16, mmx);
- SET_HPEL_FUNCS(avg_no_rnd, 0, 16, mmx);
- SET_HPEL_FUNCS(put, 1, 8, mmx);
- SET_HPEL_FUNCS(put_no_rnd, 1, 8, mmx);
- SET_HPEL_FUNCS(avg, 1, 8, mmx);
+ SET_HPEL_FUNCS(put, [0], 16, mmx);
+ SET_HPEL_FUNCS(put_no_rnd, [0], 16, mmx);
+ SET_HPEL_FUNCS(avg, [0], 16, mmx);
+ SET_HPEL_FUNCS(avg_no_rnd, , 16, mmx);
+ SET_HPEL_FUNCS(put, [1], 8, mmx);
+ SET_HPEL_FUNCS(put_no_rnd, [1], 8, mmx);
+ SET_HPEL_FUNCS(avg, [1], 8, mmx);
switch (avctx->idct_algo) {
case FF_IDCT_AUTO:
--
1.8.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
