aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoren Merritt <lorenm@u.washington.edu>2006-05-05 18:08:01 +0000
committerLoren Merritt <lorenm@u.washington.edu>2006-05-05 18:08:01 +0000
commit09786209e6d9fd4beed46f06545f209643a5a75e (patch)
tree9a22a3c09c17b07547dda0a1b81c8838e3c18059
parent215e46e6e5a3f56a041bb2a6375bdfa9e3573786 (diff)
downloadffmpeg-09786209e6d9fd4beed46f06545f209643a5a75e.tar.gz
reinit quant matrices if pps is overwritten by another of the same pps_id.
Originally committed as revision 5346 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h264.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2f3ba29fdd..52a04dccbd 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7390,6 +7390,8 @@ static inline int decode_picture_parameter_set(H264Context *h, int bit_length){
pps->constrained_intra_pred= get_bits1(&s->gb);
pps->redundant_pic_cnt_present = get_bits1(&s->gb);
+ pps->transform_8x8_mode= 0;
+ h->dequant_coeff_pps= -1; //contents of sps/pps can change even if id doesn't, so reinit
memset(pps->scaling_matrix4, 16, 6*16*sizeof(uint8_t));
memset(pps->scaling_matrix8, 16, 2*64*sizeof(uint8_t));