ffmpeg | branch: master | Derek Buitenhuis <derek.buitenh...@gmail.com> | Mon Apr 11 15:00:46 2016 +0100| [e06f5c6f94835374fc34eb2be4fa3d338d6a7dce] | committer: Derek Buitenhuis
Merge commit '35b1cd343cd703c1b0fc926dc43a92141a357380' * commit '35b1cd343cd703c1b0fc926dc43a92141a357380': vc1dec: Drop commented out cruft Merged-by: Derek Buitenhuis <derek.buitenh...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e06f5c6f94835374fc34eb2be4fa3d338d6a7dce --- libavcodec/vc1dec.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index f66afb9..9c49f6a 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -362,14 +362,6 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) v->mv_f_next[0] = v->mv_f_next_base + s->b8_stride + 1; v->mv_f_next[1] = v->mv_f_next[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2); - /* Init coded blocks info */ - if (v->profile == PROFILE_ADVANCED) { -// if (alloc_bitplane(&v->over_flags_plane, s->mb_width, s->mb_height) < 0) -// return -1; -// if (alloc_bitplane(&v->ac_pred_plane, s->mb_width, s->mb_height) < 0) -// return -1; - } - ff_intrax8_common_init(&v->x8,s); if (s->avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || s->avctx->codec_id == AV_CODEC_ID_VC1IMAGE) { ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
