diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 23:41:27 +0300 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 23:41:27 +0300 |
commit | e811ebcd9cd5223239d72c07c79d63ec51ac3259 (patch) | |
tree | bfba538af222921c0e0e760cad1be5d7a8d142b0 /libavcodec/wmv2dec.c | |
parent | f2c78128395e899b5b1eebe2426ca55d577363f0 (diff) | |
parent | ca8c7591735c0f80cc29e31e2e92cb10228e14c7 (diff) |
Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'
* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
intrax8: Remove mpegvideo dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/wmv2dec.c')
-rw-r--r-- | libavcodec/wmv2dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index ab9cfae244..20dbee5703 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -471,7 +471,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, w->s.block, w->s.block_last_index, - w->s.mb_width, w->s.mb_height, &w->s); + w->s.mb_width, w->s.mb_height); } static av_cold int wmv2_decode_end(AVCodecContext *avctx) |