changeset 10064:41796cdda927 libavcodec

Use the AOT enum instead of integer literals for setting and comparing audio object types.
author alexc
date Mon, 17 Aug 2009 00:17:58 +0000
parents 669776b7b051
children 42a126c78744
files mpeg4audio.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg4audio.c	Mon Aug 17 00:15:02 2009 +0000
+++ b/mpeg4audio.c	Mon Aug 17 00:17:58 2009 +0000
@@ -36,7 +36,7 @@
 static inline int get_object_type(GetBitContext *gb)
 {
     int object_type = get_bits(gb, 5);
-    if (object_type == 31)
+    if (object_type == AOT_ESCAPE)
         object_type = 32 + get_bits(gb, 6);
     return object_type;
 }
@@ -66,7 +66,7 @@
         if (c->object_type == AOT_ER_BSAC)
             c->ext_chan_config = get_bits(&gb, 4);
     } else {
-        c->ext_object_type = 0;
+        c->ext_object_type = AOT_NULL;
         c->ext_sample_rate = 0;
     }
     specific_config_bitindex = get_bits_count(&gb);