diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 23:35:20 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 23:35:20 +0300 |
| commit | 578fb5a27d4523c958a1907787b659883a2d9b5b (patch) | |
| tree | f6fdba3aec0a5072b005e848ca801ec34442632a /libavcodec/wmv2dec.c | |
| parent | eee5a7cd7d150024ff74fc1ffa78ab5dfb06131c (diff) | |
| parent | d0540fd02171a6233d2016b199d013299debf7e3 (diff) | |
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/wmv2dec.c')
| -rw-r--r-- | libavcodec/wmv2dec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index 67a06b6b02..92f7f0bdf0 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -468,7 +468,8 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) ff_wmv2_common_init(w); - return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, &w->s); + return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, + w->s.mb_width, w->s.mb_height, &w->s); } static av_cold int wmv2_decode_end(AVCodecContext *avctx) |