diff options
| author | Alex Converse <alex.converse@gmail.com> | 2009-08-17 00:17:58 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2009-08-17 00:17:58 +0000 |
| commit | 0cc4701a3af131a1deb21e3a81985887f72c88b1 (patch) | |
| tree | dc4156782b3c2c0da4d01d40af78d726e96ad81f | |
| parent | d691da95082d96f25a5f470ede9fa737e2d70c6c (diff) | |
| download | ffmpeg-0cc4701a3af131a1deb21e3a81985887f72c88b1.tar.gz | |
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
| -rw-r--r-- | libavcodec/mpeg4audio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index cbee0bfde2..6c0bc7d76a 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); |