Browse Source

aac: Only output configure if audio was found.

Audio found is not triggered on a CCE because a CCE alone has no output.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
tags/n0.9
Alex Converse Luca Barbato 14 years ago
parent
commit
d8425ed4af
1 changed files with 5 additions and 2 deletions
  1. +5
    -2
      libavcodec/aacdec.c

+ 5
- 2
libavcodec/aacdec.c View File

@@ -2114,7 +2114,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
ChannelElement *che = NULL, *che_prev = NULL;
enum RawDataBlockType elem_type, elem_type_prev = TYPE_END;
int err, elem_id, data_size_tmp;
int samples = 0, multiplier;
int samples = 0, multiplier, audio_found = 0;

if (show_bits(gb, 12) == 0xfff) {
if (parse_adts_frame_header(ac, gb) < 0) {
@@ -2145,10 +2145,12 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,

case TYPE_SCE:
err = decode_ics(ac, &che->ch[0], gb, 0, 0);
audio_found = 1;
break;

case TYPE_CPE:
err = decode_cpe(ac, gb, che);
audio_found = 1;
break;

case TYPE_CCE:
@@ -2157,6 +2159,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,

case TYPE_LFE:
err = decode_ics(ac, &che->ch[0], gb, 0, 0);
audio_found = 1;
break;

case TYPE_DSE:
@@ -2233,7 +2236,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data,
samples, avctx->channels);
}

if (ac->output_configured)
if (ac->output_configured && audio_found)
ac->output_configured = OC_LOCKED;

return 0;


Loading…
Cancel
Save