diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:41:27 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:41:27 +0100 |
| commit | e811ebcd9cd5223239d72c07c79d63ec51ac3259 (patch) | |
| tree | bfba538af222921c0e0e760cad1be5d7a8d142b0 /libavcodec/vc1dec.c | |
| parent | f2c78128395e899b5b1eebe2426ca55d577363f0 (diff) | |
| parent | ca8c7591735c0f80cc29e31e2e92cb10228e14c7 (diff) | |
| download | ffmpeg-e811ebcd9cd5223239d72c07c79d63ec51ac3259.tar.gz | |
Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'
* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
intrax8: Remove mpegvideo dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index e78f8cb738..78affe63ce 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -389,8 +389,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, s->block, s->block_last_index, - s->mb_width, s->mb_height, - s); + s->mb_width, s->mb_height); if (ret < 0) goto error; |