[SCM] libav/experimental: filter_mb_fast needs cbp_table to be set.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:57:58 UTC 2013
The following commit has been merged in the experimental branch:
commit 439d6b1dcf01e31ff3c839a8611502d17407120a
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Mon Jan 18 19:45:02 2010 +0000
filter_mb_fast needs cbp_table to be set.
Originally committed as revision 21290 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 2e802f5..86ee926 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)){
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list