diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 00:55:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 00:56:15 +0200 |
| commit | d98c3adef2efadfa0c8cd923b932646f66800614 (patch) | |
| tree | 35e879c7af98709402b23d698e9a7860795f4716 | |
| parent | 05bea443935a64c720b9de845b3dd9717bce618e (diff) | |
| parent | 015821229f96bf7e677f2a711a58dbea3009f574 (diff) | |
| download | ffmpeg-d98c3adef2efadfa0c8cd923b932646f66800614.tar.gz | |
Merge commit '015821229f96bf7e677f2a711a58dbea3009f574'
* commit '015821229f96bf7e677f2a711a58dbea3009f574':
vp3: Use full transpose for all IDCTs
Conflicts:
libavcodec/vp3.c
libavcodec/vp3dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/bfin/vp3_bfin.c | 1 | ||||
| -rw-r--r-- | libavcodec/vp3dsp.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c index 5cd9a97259..868c431492 100644 --- a/libavcodec/bfin/vp3_bfin.c +++ b/libavcodec/bfin/vp3_bfin.c @@ -61,6 +61,5 @@ av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags) if (!(flags & CODEC_FLAG_BITEXACT)) { c->idct_add = bfin_vp3_idct_add; c->idct_put = bfin_vp3_idct_put; - c->idct_perm = FF_TRANSPOSE_IDCT_PERM; } } diff --git a/libavcodec/vp3dsp.c b/libavcodec/vp3dsp.c index 93489637ba..56566293d7 100644 --- a/libavcodec/vp3dsp.c +++ b/libavcodec/vp3dsp.c @@ -138,7 +138,7 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int Hd = Bd + H; /* Final sequence of operations over-write original inputs. */ - if(type==1){ + if (type == 1) { dst[0*stride] = av_clip_uint8((Gd + Cd ) >> 4); dst[7*stride] = av_clip_uint8((Gd - Cd ) >> 4); @@ -165,7 +165,7 @@ static av_always_inline void idct(uint8_t *dst, int stride, int16_t *input, int } } else { - if(type==1){ + if (type == 1) { dst[0*stride]= dst[1*stride]= dst[2*stride]= |