mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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>
This commit is contained in:
commit
d98c3adef2
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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]=
|
||||
|
Loading…
Reference in New Issue
Block a user