# HG changeset patch # User bwolowiec # Date 1206397282 0 # Node ID 5d9fe8d1764322b18d8b7cc4d4e2b9ae5f00275c # Parent 5542d0c04a5554ff4c1295d1ce609881288c5daa using EAC3_STREAM_TYPE_* instead of numbers diff -r 5542d0c04a55 -r 5d9fe8d17643 aac_parser.c --- a/aac_parser.c Mon Mar 24 21:25:49 2008 +0000 +++ b/aac_parser.c Mon Mar 24 22:21:22 2008 +0000 @@ -83,7 +83,7 @@ static av_cold int aac_parse_init(AVCodecParserContext *s1) { AACAC3ParseContext *s = s1->priv_data; - s->stream_type = 0; + s->stream_type = EAC3_STREAM_TYPE_INDEPENDENT; s->inbuf_ptr = s->inbuf; s->header_size = AAC_HEADER_SIZE; s->sync = aac_sync; diff -r 5542d0c04a55 -r 5d9fe8d17643 ac3_parser.c --- a/ac3_parser.c Mon Mar 24 21:25:49 2008 +0000 +++ b/ac3_parser.c Mon Mar 24 22:21:22 2008 +0000 @@ -84,12 +84,12 @@ hdr->bit_rate = (ff_ac3_bitrate_tab[frame_size_code>>1] * 1000) >> hdr->sr_shift; hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; hdr->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2; - hdr->stream_type = 0; + hdr->stream_type = EAC3_STREAM_TYPE_INDEPENDENT; } else { /* Enhanced AC-3 */ hdr->crc1 = 0; hdr->stream_type = get_bits(&gbc, 2); - if(hdr->stream_type == 3) + if(hdr->stream_type == EAC3_STREAM_TYPE_RESERVED) return AC3_PARSE_ERROR_STREAM_TYPE; skip_bits(&gbc, 3); // skip substream id