summaryrefslogtreecommitdiff
path: root/libavcodec/h264_cavlc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-18 19:45:02 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-18 19:45:02 +0000
commit439d6b1dcf01e31ff3c839a8611502d17407120a (patch)
tree057408b2ff181d144230fb11d4fc5a6f34eeef2f /libavcodec/h264_cavlc.c
parent42ebca85514bd38347d145cf049c92db69d8644f (diff)
downloadffmpeg-439d6b1dcf01e31ff3c839a8611502d17407120a.tar.gz
filter_mb_fast needs cbp_table to be set.
Originally committed as revision 21290 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264_cavlc.c')
-rw-r--r--libavcodec/h264_cavlc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 2e802f5fb5..86ee926b5c 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -911,14 +911,14 @@ decode_intra_mb:
else cbp= golomb_to_inter_cbp_gray[cbp];
}
}
- h->cbp = cbp;
if(dct8x8_allowed && (cbp&15) && !IS_INTRA(mb_type)){
if(get_bits1(&s->gb)){
mb_type |= MB_TYPE_8x8DCT;
- h->cbp_table[mb_xy]= cbp;
}
}
+ h->cbp=
+ h->cbp_table[mb_xy]= cbp;
s->current_picture.mb_type[mb_xy]= mb_type;
if(cbp || IS_INTRA16x16(mb_type)){