diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2011-10-21 17:14:58 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-10-25 12:08:21 +0200 |
| commit | 28287045ca3ee34e4ea980628ec8314fd2d819ae (patch) | |
| tree | 671349820b40158b950a02bf3860ab29a9e25a9a /libavcodec/aacdec.c | |
| parent | 785f876cee7b55fe54007da00759a8f1cf81db36 (diff) | |
| download | android_external_ffmpeg-28287045ca3ee34e4ea980628ec8314fd2d819ae.tar.gz android_external_ffmpeg-28287045ca3ee34e4ea980628ec8314fd2d819ae.tar.bz2 android_external_ffmpeg-28287045ca3ee34e4ea980628ec8314fd2d819ae.zip | |
cosmetics: simplify latm_decode_init
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 9 |
1 files changed, 2 insertions, 7 deletions
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; } |