[FFmpeg-soc] [soc]: r2705 - aac/aac.c
superdump
subversion at mplayerhq.hu
Sun Jul 6 13:56:58 CEST 2008
Author: superdump
Date: Sun Jul 6 13:56:57 2008
New Revision: 2705
Log:
Simplification
Modified:
aac/aac.c
Modified: aac/aac.c
==============================================================================
--- aac/aac.c (original)
+++ aac/aac.c Sun Jul 6 13:56:57 2008
@@ -2091,6 +2091,7 @@ static int aac_decode_frame(AVCodecConte
// parse
while ((id = get_bits(&gb, 3)) != ID_END) {
tag = get_bits(&gb, 4);
+ err = -1;
switch (id) {
case ID_SCE:
@@ -2111,10 +2112,8 @@ static int aac_decode_frame(AVCodecConte
break;
case ID_CPE:
- if (ac->che[ID_CPE][tag]) {
+ if (ac->che[ID_CPE][tag])
err = decode_cpe(ac, &gb, tag);
- } else
- err = -1;
break;
case ID_FIL:
@@ -2135,17 +2134,13 @@ static int aac_decode_frame(AVCodecConte
break;
case ID_CCE:
- if (ac->che[ID_CCE][tag]) {
+ if (ac->che[ID_CCE][tag])
err = decode_cce(ac, &gb, tag);
- } else
- err = -1;
break;
case ID_LFE:
- if (ac->che[ID_LFE][tag]) {
+ if (ac->che[ID_LFE][tag])
err = decode_ics(ac, &gb, 0, 0, &ac->che[ID_LFE][tag]->ch[0]);
- } else
- err = -1;
break;
default:
More information about the FFmpeg-soc
mailing list