projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
785f876
)
cosmetics: simplify latm_decode_init
author
Janne Grunau
<janne-libav@jannau.net>
Fri, 21 Oct 2011 15:14:58 +0000
(17:14 +0200)
committer
Janne Grunau
<janne-libav@jannau.net>
Tue, 25 Oct 2011 10:08:21 +0000
(12:08 +0200)
libavcodec/aacdec.c
patch
|
blob
|
history
diff --git
a/libavcodec/aacdec.c
b/libavcodec/aacdec.c
index
6000fe1
..
37ccd18
100644
(file)
--- 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;
}