diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 15:00:46 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-11 15:00:53 +0100 |
| commit | e06f5c6f94835374fc34eb2be4fa3d338d6a7dce (patch) | |
| tree | c7b52c5f46070c566be325ef43b165e3b649c3ab /libavcodec/vc1dec.c | |
| parent | 8a1c79024da48ef44cc0ba5252ec6fc28e62453b (diff) | |
| parent | 35b1cd343cd703c1b0fc926dc43a92141a357380 (diff) | |
| download | ffmpeg-e06f5c6f94835374fc34eb2be4fa3d338d6a7dce.tar.gz | |
Merge commit '35b1cd343cd703c1b0fc926dc43a92141a357380'
* commit '35b1cd343cd703c1b0fc926dc43a92141a357380':
vc1dec: Drop commented out cruft
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index f66afb9d32..9c49f6af10 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) { |