diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:35:20 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:35:20 +0100 |
| commit | 578fb5a27d4523c958a1907787b659883a2d9b5b (patch) | |
| tree | f6fdba3aec0a5072b005e848ca801ec34442632a /libavcodec/vc1dec.c | |
| parent | eee5a7cd7d150024ff74fc1ffa78ab5dfb06131c (diff) | |
| parent | d0540fd02171a6233d2016b199d013299debf7e3 (diff) | |
| download | ffmpeg-578fb5a27d4523c958a1907787b659883a2d9b5b.tar.gz | |
Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'
* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
intrax8: Pass macroblock size to ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 786c6dbefc..89996a11b1 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -387,7 +387,9 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) return AVERROR(ENOMEM); } - ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, s); + ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, + s->mb_width, s->mb_height, + s); if (ret < 0) goto error; |