diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-09 16:32:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-09 16:32:39 +0200 |
| commit | 3a1df52e3ce70f41c4f8b9900be2c2907b7e21ef (patch) | |
| tree | fd33523cf6ed3e5fd50a2a328c588a9a3e722fdd /libavcodec/rv30dsp.c | |
| parent | aae1c247b1cd5f17c137f5c7f357c519200b1017 (diff) | |
| parent | 7351eb14151602fa924ab3d5e374b7d60f32aff9 (diff) | |
| download | ffmpeg-3a1df52e3ce70f41c4f8b9900be2c2907b7e21ef.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Pretty-print RV3/4 decoder source
Saner RV1/2 initialisation and RV2 header parsing.
Conflicts:
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rv30dsp.c')
| -rw-r--r-- | libavcodec/rv30dsp.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/rv30dsp.c b/libavcodec/rv30dsp.c index 4700e7868c..25c96c9d80 100644 --- a/libavcodec/rv30dsp.c +++ b/libavcodec/rv30dsp.c @@ -29,10 +29,10 @@ #define RV30_LOWPASS(OPNAME, OP) \ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\ - const int h=8;\ + const int h = 8;\ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ - for(i=0; i<h; i++)\ + for(i = 0; i < h; i++)\ {\ OP(dst[0], (-(src[-1]+src[2]) + src[0]*C1 + src[1]*C2 + 8)>>4);\ OP(dst[1], (-(src[ 0]+src[3]) + src[1]*C1 + src[2]*C2 + 8)>>4);\ @@ -42,28 +42,28 @@ static av_unused void OPNAME ## rv30_tpel8_h_lowpass(uint8_t *dst, uint8_t *src, OP(dst[5], (-(src[ 4]+src[7]) + src[5]*C1 + src[6]*C2 + 8)>>4);\ OP(dst[6], (-(src[ 5]+src[8]) + src[6]*C1 + src[7]*C2 + 8)>>4);\ OP(dst[7], (-(src[ 6]+src[9]) + src[7]*C1 + src[8]*C2 + 8)>>4);\ - dst+=dstStride;\ - src+=srcStride;\ + dst += dstStride;\ + src += srcStride;\ }\ }\ \ static void OPNAME ## rv30_tpel8_v_lowpass(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, const int C1, const int C2){\ - const int w=8;\ + const int w = 8;\ uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;\ int i;\ - for(i=0; i<w; i++)\ + for(i = 0; i < w; i++)\ {\ - const int srcA= src[-1*srcStride];\ - const int src0= src[0 *srcStride];\ - const int src1= src[1 *srcStride];\ - const int src2= src[2 *srcStride];\ - const int src3= src[3 *srcStride];\ - const int src4= src[4 *srcStride];\ - const int src5= src[5 *srcStride];\ - const int src6= src[6 *srcStride];\ - const int src7= src[7 *srcStride];\ - const int src8= src[8 *srcStride];\ - const int src9= src[9 *srcStride];\ + const int srcA = src[-1*srcStride];\ + const int src0 = src[0 *srcStride];\ + const int src1 = src[1 *srcStride];\ + const int src2 = src[2 *srcStride];\ + const int src3 = src[3 *srcStride];\ + const int src4 = src[4 *srcStride];\ + const int src5 = src[5 *srcStride];\ + const int src6 = src[6 *srcStride];\ + const int src7 = src[7 *srcStride];\ + const int src8 = src[8 *srcStride];\ + const int src9 = src[9 *srcStride];\ OP(dst[0*dstStride], (-(srcA+src2) + src0*C1 + src1*C2 + 8)>>4);\ OP(dst[1*dstStride], (-(src0+src3) + src1*C1 + src2*C2 + 8)>>4);\ OP(dst[2*dstStride], (-(src1+src4) + src2*C1 + src3*C2 + 8)>>4);\ |