[SCM] libav/experimental: Use the AOT enum instead of integer literals for setting and comparing audio object types.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0cc4701a3af131a1deb21e3a81985887f72c88b1
Author: Alex Converse <alex.converse at gmail.com>
Date:   Mon Aug 17 00:17:58 2009 +0000

    Use the AOT enum instead of integer literals for setting and comparing audio
    object types.
    
    Originally committed as revision 19666 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index cbee0bf..6c0bc7d 100644
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -36,7 +36,7 @@ const uint8_t ff_mpeg4audio_channels[8] = {
 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 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
         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);

-- 
Libav/FFmpeg packaging