diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 63fb32e426d92a7c200ceefcf1d6ba0135fe3945..3e3e550b115c2b77ae47eb9f7bd2fbc0a5616179 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -2360,32 +2360,29 @@ static void h263_h_loop_filter_c(uint8_t *src, int stride, int qscale){
}
}
-static void h261_v_loop_filter_c(uint8_t *dest,uint8_t *src, int stride){
- int i,j,xy,yz;
- int res;
- for(i=0; i<8; i++){
- for(j=1; j<7; j++){
- xy = j * stride + i;
- yz = j * 8 + i;
- res = (int)src[yz-1*8] + ((int)(src[yz+0*8]) * 2) + (int)src[yz+1*8];
- res +=2;
- res >>=2;
- dest[xy] = (uint8_t)res;
+static void h261_loop_filter_c(uint8_t *src, int stride){
+ int x,y,xy,yz;
+ int temp[64];
+
+ for(x=0; x<8; x++){
+ temp[x ] = 4*src[x ];
+ temp[x + 7*8] = 4*src[x + 7*stride];
+ }
+ for(y=1; y<7; y++){
+ for(x=0; x<8; x++){
+ xy = y * stride + x;
+ yz = y * 8 + x;
+ temp[yz] = src[xy - stride] + 2*src[xy] + src[xy + stride];
}
}
-}
-
-static void h261_h_loop_filter_c(uint8_t *dest,uint8_t *src, int stride){
- int i,j,xy,yz;
- int res;
- for(i=1; i<7; i++){
- for(j=0; j<8; j++){
- xy = j * stride + i;
- yz = j * 8 + i;
- res = (int)src[yz-1] + ((int)(src[yz]) *2) + (int)src[yz+1];
- res+=2;
- res>>=2;
- dest[xy] = (uint8_t)res;
+
+ for(y=0; y<8; y++){
+ src[ y*stride] = (temp[ y*8] + 2)>>2;
+ src[7+y*stride] = (temp[7+y*8] + 2)>>2;
+ for(x=1; x<7; x++){
+ xy = y * stride + x;
+ yz = y * 8 + x;
+ src[xy] = (temp[yz-1] + 2*temp[yz] + temp[yz+1] + 8)>>4;
}
}
}
@@ -3325,8 +3322,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
c->h263_h_loop_filter= h263_h_loop_filter_c;
c->h263_v_loop_filter= h263_v_loop_filter_c;
- c->h261_h_loop_filter= h261_h_loop_filter_c;
- c->h261_v_loop_filter= h261_v_loop_filter_c;
+ c->h261_loop_filter= h261_loop_filter_c;
c->try_8x8basis= try_8x8basis_c;
c->add_8x8basis= add_8x8basis_c;
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 16f70b428b009715fd30dee03d80e31e4d7a497a..cdc5a3b859abe925bed1c9417d5d5327ed2c327a 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -261,8 +261,7 @@ typedef struct DSPContext {
void (*h263_v_loop_filter)(uint8_t *src, int stride, int qscale);
void (*h263_h_loop_filter)(uint8_t *src, int stride, int qscale);
- void (*h261_v_loop_filter)(uint8_t *dest,uint8_t *src, int stride);
- void (*h261_h_loop_filter)(uint8_t *dest,uint8_t *src, int stride);
+ void (*h261_loop_filter)(uint8_t *src, int stride);
/* (I)DCT */
void (*fdct)(DCTELEM *block/* align 16*/);
diff --git a/libavcodec/h261.c b/libavcodec/h261.c
index 236fd8a3cac09f99ba4ec033fa74fed9af09ab1e..6ec8de630a344df141ef24712564fb9b154d4d49 100644
--- a/libavcodec/h261.c
+++ b/libavcodec/h261.c
@@ -64,44 +64,13 @@ void ff_h261_loop_filter(H261Context * h){
uint8_t *dest_y = s->dest[0];
uint8_t *dest_cb= s->dest[1];
uint8_t *dest_cr= s->dest[2];
- uint8_t *src;
-
- CHECKED_ALLOCZ((src),sizeof(uint8_t) * 64 );
-
- for(i=0; i<8;i++)
- memcpy(src+i*8,dest_y+i*linesize,sizeof(uint8_t) * 8 );
- s->dsp.h261_v_loop_filter(dest_y, src, linesize);
- s->dsp.h261_h_loop_filter(dest_y, src, linesize);
-
- for(i=0; i<8;i++)
- memcpy(src+i*8,dest_y+i*linesize + 8,sizeof(uint8_t) * 8 );
- s->dsp.h261_v_loop_filter(dest_y + 8, src, linesize);
- s->dsp.h261_h_loop_filter(dest_y + 8, src, linesize);
-
- for(i=0; i<8;i++)
- memcpy(src+i*8,dest_y+(i+8)*linesize,sizeof(uint8_t) * 8 );
- s->dsp.h261_v_loop_filter(dest_y + 8 * linesize, src, linesize);
- s->dsp.h261_h_loop_filter(dest_y + 8 * linesize, src, linesize);
-
- for(i=0; i<8;i++)
- memcpy(src+i*8,dest_y+(i+8)*linesize + 8,sizeof(uint8_t) * 8 );
- s->dsp.h261_v_loop_filter(dest_y + 8 * linesize + 8, src, linesize);
- s->dsp.h261_h_loop_filter(dest_y + 8 * linesize + 8, src, linesize);
-
- for(i=0; i<8;i++)
- memcpy(src+i*8,dest_cb+i*uvlinesize,sizeof(uint8_t) * 8 );
- s->dsp.h261_v_loop_filter(dest_cb, src, uvlinesize);
- s->dsp.h261_h_loop_filter(dest_cb, src, uvlinesize);
-
- for(i=0; i<8;i++)
- memcpy(src+i*8,dest_cr+i*uvlinesize,sizeof(uint8_t) * 8 );
- s->dsp.h261_v_loop_filter(dest_cr, src, uvlinesize);
- s->dsp.h261_h_loop_filter(dest_cr, src, uvlinesize);
-
-fail:
- av_free(src);
-
- return;
+
+ s->dsp.h261_loop_filter(dest_y , linesize);
+ s->dsp.h261_loop_filter(dest_y + 8, linesize);
+ s->dsp.h261_loop_filter(dest_y + 8 * linesize , linesize);
+ s->dsp.h261_loop_filter(dest_y + 8 * linesize + 8, linesize);
+ s->dsp.h261_loop_filter(dest_cb, uvlinesize);
+ s->dsp.h261_loop_filter(dest_cr, uvlinesize);
}
static int h261_decode_block(H261Context *h, DCTELEM *block,