summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg4audio.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2009-08-03 02:09:23 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-08-03 02:09:23 +0000
commitb5fe06abf0841cde115b45ac0fc807d072dfde89 (patch)
tree39c6f2cfc5f918e90672ec2c76ab3a2e97410bc4 /libavcodec/mpeg4audio.c
parentc15508dc93ebaac9e04a436f6f1d6af09a0a350e (diff)
downloadffmpeg-b5fe06abf0841cde115b45ac0fc807d072dfde89.tar.gz
Replace 5 with AOT_SBR when referring to the MPEG-4 audio object type.
Originally committed as revision 19569 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg4audio.c')
-rw-r--r--libavcodec/mpeg4audio.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index e9b60b7ee0..cbee0bfde2 100644
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -58,7 +58,7 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
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(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si
}
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