[FFmpeg-cvslog] r19569 - trunk/libavcodec/mpeg4audio.c

[jbr]

Author: jbr
Date: Mon Aug  3 04:09:23 2009
New Revision: 19569

Log:
Replace 5 with AOT_SBR when referring to the MPEG-4 audio object type.

Modified:
   trunk/libavcodec/mpeg4audio.c

Modified: trunk/libavcodec/mpeg4audio.c
==============================================================================
--- trunk/libavcodec/mpeg4audio.c	Sun Aug  2 19:42:40 2009	(r19568)
+++ trunk/libavcodec/mpeg4audio.c	Mon Aug  3 04:09:23 2009	(r19569)
@@ -58,7 +58,7 @@ int ff_mpeg4audio_get_config(MPEG4AudioC
     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 @@ int ff_mpeg4audio_get_config(MPEG4AudioC
     }
     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