[FFmpeg-cvslog] cosmetics: simplify latm_decode_init

Janne Grunau git at videolan.org
Wed Oct 26 02:46:26 CEST 2011


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Fri Oct 21 17:14:58 2011 +0200| [28287045ca3ee34e4ea980628ec8314fd2d819ae] | committer: Janne Grunau

cosmetics: simplify latm_decode_init

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28287045ca3ee34e4ea980628ec8314fd2d819ae
---

 libavcodec/aacdec.c |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c
index 6000fe1..37ccd18 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;
 }



More information about the ffmpeg-cvslog mailing list