using EAC3_STREAM_TYPE_* instead of numbers

Originally committed as revision 12571 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index 4e8ddc1..7e6678d 100644 (file)
--- 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 393133e..7f0818b 100644 (file)
--- 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