History

Merge commit '35b1cd343cd703c1b0fc926dc43a92141a357380'

* commit '35b1cd343cd703c1b0fc926dc43a92141a357380': vc1dec: Drop commented out cruft

Derek Buitenhuis committed 10 years ago

Commit e06f5c62 parents 8a1c790 35b1cd31 file · +0 −8Browse files

Unified · Split

libavcodec/vc1dec.c+0−8
@@ -362,14 +362,6 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) · 361 unmodified lines
362 v->mv_f_next[0] = v->mv_f_next_base + s->b8_stride + 1;362 v->mv_f_next[0] = v->mv_f_next_base + s->b8_stride + 1;
363 v->mv_f_next[1] = v->mv_f_next[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);363 v->mv_f_next[1] = v->mv_f_next[0] + (s->b8_stride * (mb_height * 2 + 1) + s->mb_stride * (mb_height + 1) * 2);
364 364
365 /* Init coded blocks info */
366 if (v->profile == PROFILE_ADVANCED) {
367// if (alloc_bitplane(&v->over_flags_plane, s->mb_width, s->mb_height) < 0)
368// return -1;
369// if (alloc_bitplane(&v->ac_pred_plane, s->mb_width, s->mb_height) < 0)
370// return -1;
371 }
372
373 ff_intrax8_common_init(&v->x8,s);365 ff_intrax8_common_init(&v->x8,s);
374 366
375 if (s->avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || s->avctx->codec_id == AV_CODEC_ID_VC1IMAGE) {367 if (s->avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || s->avctx->codec_id == AV_CODEC_ID_VC1IMAGE) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t