changeset 10009:8649dc2299e2 libavcodec

Replace 5 with AOT_SBR when referring to the MPEG-4 audio object type.
author jbr
date Mon, 03 Aug 2009 02:09:23 +0000
parents 5eb52cc093e2
children 18dab2b47db7
files mpeg4audio.c
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg4audio.c	Sun Aug 02 15:10:03 2009 +0000
+++ b/mpeg4audio.c	Mon Aug 03 02:09:23 2009 +0000
@@ -58,7 +58,7 @@
     c->sample_rate = get_sample_rate(&gb, &c->sampling_index);
     c->chan_config = get_bits(&gb, 4);
     c->sbr = -1;
-    if (c->object_type == 5) {
+    if (c->object_type == AOT_SBR) {
         c->ext_object_type = c->object_type;
         c->sbr = 1;
         c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);
@@ -71,13 +71,13 @@
     }
     specific_config_bitindex = get_bits_count(&gb);
 
-    if (c->ext_object_type != 5) {
+    if (c->ext_object_type != AOT_SBR) {
         int bits_left = buf_size*8 - specific_config_bitindex;
         for (; bits_left > 15; bits_left--) {
             if (show_bits(&gb, 11) == 0x2b7) { // sync extension
                 get_bits(&gb, 11);
                 c->ext_object_type = get_object_type(&gb);
-                if (c->ext_object_type == 5 && (c->sbr = get_bits1(&gb)) == 1)
+                if (c->ext_object_type == AOT_SBR && (c->sbr = get_bits1(&gb)) == 1)
                     c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index);
                 break;
             } else