diff options
author | Anton Khirnov <anton@khirnov.net> | 2012-11-14 08:09:01 +0100 |
---|---|---|
committer | Anton Khirnov <anton@khirnov.net> | 2013-01-06 13:31:39 +0100 |
commit | 85383d139a54ebd9d8e8bb7d6dc6b0e03bc769ca (patch) | |
tree | 11ee3b41008a5536ead24df974cf6382f38f04d3 | |
parent | aa15afb7ce850e2ac688efdef189df5da817a646 (diff) | |
download | ffmpeg-85383d139a54ebd9d8e8bb7d6dc6b0e03bc769ca.tar.gz |
4xm: eliminate a pointless indirection
-rw-r--r-- | libavcodec/4xm.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 446c085f1b..d924a78652 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -877,16 +877,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, return buf_size; } - -static av_cold void common_init(AVCodecContext *avctx) -{ - FourXContext * const f = avctx->priv_data; - - ff_dsputil_init(&f->dsp, avctx); - - f->avctx = avctx; -} - static av_cold int decode_init(AVCodecContext *avctx) { FourXContext * const f = avctx->priv_data; @@ -897,7 +887,8 @@ static av_cold int decode_init(AVCodecContext *avctx) } f->version = AV_RL32(avctx->extradata) >> 16; - common_init(avctx); + ff_dsputil_init(&f->dsp, avctx); + f->avctx = avctx; init_vlcs(f); if (f->version > 2) |