Module: libav Branch: master Commit: 85383d139a54ebd9d8e8bb7d6dc6b0e03bc769ca
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Wed Nov 14 08:09:01 2012 +0100 4xm: eliminate a pointless indirection --- libavcodec/4xm.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 446c085..d924a78 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) _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
