RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 09:12:33 +00:00
Code Issues Projects Releases Wiki Activity

Use the AOT enum instead of integer literals for setting and comparing audio

Browse Source 
object types.

Originally committed as revision 19666 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2009-08-17 00:17:58 +00:00
parent d691da9508
commit 0cc4701a3a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpeg4audio.c
View File

@ -36,7 +36,7 @@ const uint8_t ff_mpeg4audio_channels[8] = {
static inline int get_object_type(GetBitContext *gb) static inline int get_object_type(GetBitContext *gb)
{ {
int object_type = get_bits(gb, 5); int object_type = get_bits(gb, 5);
if (object_type == 31) if (object_type == AOT_ESCAPE)
object_type = 32 + get_bits(gb, 6); object_type = 32 + get_bits(gb, 6);
return object_type; 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) if (c->object_type == AOT_ER_BSAC)
c->ext_chan_config = get_bits(&gb, 4); c->ext_chan_config = get_bits(&gb, 4);
} else { } else {
c->ext_object_type = 0; c->ext_object_type = AOT_NULL;
c->ext_sample_rate = 0; c->ext_sample_rate = 0;
} }
specific_config_bitindex = get_bits_count(&gb); specific_config_bitindex = get_bits_count(&gb);