From 28287045ca3ee34e4ea980628ec8314fd2d819ae Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Fri, 21 Oct 2011 17:14:58 +0200 Subject: cosmetics: simplify latm_decode_init --- libavcodec/aacdec.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'libavcodec/aacdec.c') diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 6000fe190b..37ccd18ecb 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -2533,15 +2533,10 @@ static int latm_decode_frame(AVCodecContext *avctx, void *out, int *out_size, av_cold static int latm_decode_init(AVCodecContext *avctx) { struct LATMContext *latmctx = avctx->priv_data; - int ret; + int ret = aac_decode_init(avctx); - ret = aac_decode_init(avctx); - - if (avctx->extradata_size > 0) { + if (avctx->extradata_size > 0) latmctx->initialized = !ret; - } else { - latmctx->initialized = 0; - } return ret; } -- cgit v1.2.3