diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
commit | efbc9d9043ff8ff92716ddd00a5f61412d535593 (patch) | |
tree | 8f3e621f756cf1f5b4d64d97964c7e7abd8aaf08 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c | |
parent | df6b139a6d9027156f614b68687e039e3a5854db (diff) |
revert r1783
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c')
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c index 9ac2344bf..b48c4e85b 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv40dsp.c @@ -99,7 +99,7 @@ static void OPNAME ## rv40_qpel16_h_lowpass(uint8_t *dst, uint8_t *src, int dstS OPNAME ## rv40_qpel8_h_lowpass(dst+8, src+8, dstStride, srcStride, h-8, C1, C2, SHIFT);\ }\ \ - + #define RV40_MC(OPNAME, SIZE) \ static void OPNAME ## rv40_qpel ## SIZE ## _mc10_c(uint8_t *dst, uint8_t *src, int stride){\ OPNAME ## rv40_qpel ## SIZE ## _h_lowpass(dst, src, stride, stride, SIZE, 52, 20, 6);\ @@ -181,7 +181,7 @@ static void OPNAME ## rv40_qpel ## SIZE ## _mc23_c(uint8_t *dst, uint8_t *src, i OPNAME ## rv40_qpel ## SIZE ## _v_lowpass(dst, full_mid, stride, SIZE, SIZE, 20, 52, 6);\ }\ \ - + #define op_avg(a, b) a = (((a)+cm[b]+1)>>1) #define op_put(a, b) a = cm[b] @@ -196,8 +196,7 @@ RV40_MC(put_, 16) RV40_MC(avg_, 8) RV40_MC(avg_, 16) -static const int rv40_bias[4][4] = -{ +static const int rv40_bias[4][4] = { { 0, 16, 32, 16 }, { 32, 28, 32, 28 }, { 0, 32, 16, 32 }, @@ -285,8 +284,7 @@ static void OPNAME ## rv40_chroma_mc8_c(uint8_t *dst/*align 8*/, uint8_t *src/*a RV40_CHROMA_MC(put_, op_put) RV40_CHROMA_MC(avg_, op_avg) -void ff_rv40dsp_init(DSPContext* c, AVCodecContext *avctx) -{ +void ff_rv40dsp_init(DSPContext* c, AVCodecContext *avctx) { c->put_rv40_qpel_pixels_tab[0][ 0] = c->put_h264_qpel_pixels_tab[0][0]; c->put_rv40_qpel_pixels_tab[0][ 1] = put_rv40_qpel16_mc10_c; c->put_rv40_qpel_pixels_tab[0][ 2] = put_rv40_qpel16_mc20_c; @@ -348,8 +346,8 @@ void ff_rv40dsp_init(DSPContext* c, AVCodecContext *avctx) c->avg_rv40_qpel_pixels_tab[1][13] = avg_rv40_qpel8_mc13_c; c->avg_rv40_qpel_pixels_tab[1][14] = avg_rv40_qpel8_mc23_c; - c->put_rv40_chroma_pixels_tab[0] = put_rv40_chroma_mc8_c; - c->put_rv40_chroma_pixels_tab[1] = put_rv40_chroma_mc4_c; - c->avg_rv40_chroma_pixels_tab[0] = avg_rv40_chroma_mc8_c; - c->avg_rv40_chroma_pixels_tab[1] = avg_rv40_chroma_mc4_c; + c->put_rv40_chroma_pixels_tab[0]= put_rv40_chroma_mc8_c; + c->put_rv40_chroma_pixels_tab[1]= put_rv40_chroma_mc4_c; + c->avg_rv40_chroma_pixels_tab[0]= avg_rv40_chroma_mc8_c; + c->avg_rv40_chroma_pixels_tab[1]= avg_rv40_chroma_mc4_c; } |