diff options
author | Aurelien Jacobs <aurel@gnuage.org> | 2008-04-02 21:41:48 +0000 |
---|---|---|
committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-04-02 21:41:48 +0000 |
commit | 7bfacd4e75a773c2cdf8ce81bed5aeff9a698140 (patch) | |
tree | 0d7117e6f241ea0411bc52dde2253e3b5b4dbea8 /libavformat/matroskadec.c | |
parent | b2fec0fc2574872c80c3cb3a700f3f58d1f302d2 (diff) | |
download | ffmpeg-streaming-7bfacd4e75a773c2cdf8ce81bed5aeff9a698140.zip ffmpeg-streaming-7bfacd4e75a773c2cdf8ce81bed5aeff9a698140.tar.gz |
use common aac sample rate tables
Originally committed as revision 12671 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r-- | libavformat/matroskadec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 86a3994..321968a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -33,6 +33,7 @@ #include "riff.h" #include "intfloat_readwrite.h" #include "matroska.h" +#include "libavcodec/mpeg4audio.h" typedef struct Track { MatroskaTrackType type; @@ -1997,14 +1998,10 @@ matroska_aac_profile (char *codec_id) static int matroska_aac_sri (int samplerate) { - static const int aac_sample_rates[] = { - 96000, 88200, 64000, 48000, 44100, 32000, - 24000, 22050, 16000, 12000, 11025, 8000, - }; int sri; - for (sri=0; sri<ARRAY_SIZE(aac_sample_rates); sri++) - if (aac_sample_rates[sri] == samplerate) + for (sri=0; sri<ARRAY_SIZE(ff_mpeg4audio_sample_rates); sri++) + if (ff_mpeg4audio_sample_rates[sri] == samplerate) break; return sri; } |