aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-03-26 20:28:29 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-03-26 20:28:29 +0000
commit042e3bfe9d0755c7b5a010cc39c67312efa90d8c (patch)
tree58b2162a1c4d78d0be60d0c318ac6dffb176bff5
parente5017ab8701c7ac3edc74fd1c1ae45b414e8eda1 (diff)
downloadffmpeg-042e3bfe9d0755c7b5a010cc39c67312efa90d8c.tar.gz
fix decoding of qp<6
Originally committed as revision 2933 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 02e51d5fec..e492e56e06 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1257,31 +1257,7 @@ static void h264_add_idct_c(uint8_t *dst, DCTELEM *block, int stride){
uint8_t *cm = cropTbl + MAX_NEG_CROP;
block[0] += 32;
-#if 1
- for(i=0; i<4; i++){
- const int z0= block[i + 4*0] + block[i + 4*2];
- const int z1= block[i + 4*0] - block[i + 4*2];
- const int z2= (block[i + 4*1]>>1) - block[i + 4*3];
- const int z3= block[i + 4*1] + (block[i + 4*3]>>1);
-
- block[i + 4*0]= z0 + z3;
- block[i + 4*1]= z1 + z2;
- block[i + 4*2]= z1 - z2;
- block[i + 4*3]= z0 - z3;
- }
-
- for(i=0; i<4; i++){
- const int z0= block[0 + 4*i] + block[2 + 4*i];
- const int z1= block[0 + 4*i] - block[2 + 4*i];
- const int z2= (block[1 + 4*i]>>1) - block[3 + 4*i];
- const int z3= block[1 + 4*i] + (block[3 + 4*i]>>1);
- dst[0 + i*stride]= cm[ dst[0 + i*stride] + ((z0 + z3) >> 6) ];
- dst[1 + i*stride]= cm[ dst[1 + i*stride] + ((z1 + z2) >> 6) ];
- dst[2 + i*stride]= cm[ dst[2 + i*stride] + ((z1 - z2) >> 6) ];
- dst[3 + i*stride]= cm[ dst[3 + i*stride] + ((z0 - z3) >> 6) ];
- }
-#else
for(i=0; i<4; i++){
const int z0= block[0 + 4*i] + block[2 + 4*i];
const int z1= block[0 + 4*i] - block[2 + 4*i];
@@ -1305,7 +1281,6 @@ static void h264_add_idct_c(uint8_t *dst, DCTELEM *block, int stride){
dst[i + 2*stride]= cm[ dst[i + 2*stride] + ((z1 - z2) >> 6) ];
dst[i + 3*stride]= cm[ dst[i + 3*stride] + ((z0 - z3) >> 6) ];
}
-#endif
}
#if 0
@@ -2162,9 +2137,6 @@ static int alloc_tables(H264Context *h){
if( h->pps.cabac ) {
CHECKED_ALLOCZ(h->chroma_pred_mode_table, big_mb_num * sizeof(uint8_t))
CHECKED_ALLOCZ(h->cbp_table, big_mb_num * sizeof(uint16_t))
- } else {
- h->chroma_pred_mode_table = NULL;
- h->cbp_table = NULL;
}
memset(h->slice_table_base, -1, big_mb_num * sizeof(uint8_t));