summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorLoren Merritt <lorenm@u.washington.edu>2005-10-26 03:58:06 +0000
committerLoren Merritt <lorenm@u.washington.edu>2005-10-26 03:58:06 +0000
commit56edbd818a07953a257797cfd26afb9c0feb603f (patch)
tree948195602db56e017c763f8eb85907071d30d7f7 /libavcodec
parentb2909f1a04c801524c6a6e1d0b7c869b39286ffe (diff)
10l: cqm weren't initialized in svq3.
Originally committed as revision 4662 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index d8a7baf91d..560782df7d 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3033,6 +3033,9 @@ static int alloc_tables(H264Context *h){
s->obmc_scratchpad = NULL;
+ if(!h->dequant4_coeff[0])
+ init_dequant_tables(h);
+
return 0;
fail:
free_tables(h);
@@ -3051,6 +3054,9 @@ static void common_init(H264Context *h){
h->dequant_coeff_pps= -1;
s->unrestricted_mv=1;
s->decode=1; //FIXME
+
+ memset(h->pps.scaling_matrix4, 16, 6*16*sizeof(uint8_t));
+ memset(h->pps.scaling_matrix8, 16, 2*64*sizeof(uint8_t));
}
static int decode_init(AVCodecContext *avctx){