diff options
| author | Bartlomiej Wolowiec <bartek.wolowiec@gmail.com> | 2008-03-24 22:21:22 +0000 |
|---|---|---|
| committer | Bartlomiej Wolowiec <bartek.wolowiec@gmail.com> | 2008-03-24 22:21:22 +0000 |
| commit | 6808a8eaf2796ac64df1a760e928664d32a994e2 (patch) | |
| tree | 6ad2bbf54c6c199a3a6a6ceb2831164a9f666743 | |
| parent | 4e6eeaf01968a22748e27590d29f343323cca9c6 (diff) | |
| download | ffmpeg-6808a8eaf2796ac64df1a760e928664d32a994e2.tar.gz | |
using EAC3_STREAM_TYPE_* instead of numbers
Originally committed as revision 12571 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/aac_parser.c | 2 | ||||
| -rw-r--r-- | libavcodec/ac3_parser.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c index 4e8ddc1dfb..7e6678d189 100644 --- a/libavcodec/aac_parser.c +++ b/libavcodec/aac_parser.c @@ -83,7 +83,7 @@ static int aac_sync(AACAC3ParseContext *hdr_info) 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 --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 393133efe7..7f0818b607 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -84,12 +84,12 @@ int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr) 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 |