diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-01 12:29:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-01 12:48:04 +0200 |
| commit | 24f822c3ab99c33f59a5b181682e3fb507bfe35d (patch) | |
| tree | 69465e50765134e24518ee9a66d93a737da052ec | |
| parent | 7d057515818d606fd1d7ab9f0dc1eebf31a47239 (diff) | |
| parent | 0933fd1533560fbc718026e12f19a4824b041237 (diff) | |
| download | ffmpeg-24f822c3ab99c33f59a5b181682e3fb507bfe35d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
oma: Validate sample rates
Conflicts:
libavformat/oma.c
See: a30165c4a8044e1d5527c1302b5a5cb473e0913d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/oma.c | 2 | ||||
| -rw-r--r-- | libavformat/omadec.c | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/libavformat/oma.c b/libavformat/oma.c index 9e4bfbdd77..fc926bf8ba 100644 --- a/libavformat/oma.c +++ b/libavformat/oma.c @@ -22,7 +22,7 @@ #include "oma.h" #include "libavcodec/avcodec.h" -const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0, 0, 0}; +const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0 }; const AVCodecTag ff_oma_codec_tags[] = { { AV_CODEC_ID_ATRAC3, OMA_CODECID_ATRAC3 }, diff --git a/libavformat/omadec.c b/libavformat/omadec.c index 9f65db05e2..ae359074f9 100644 --- a/libavformat/omadec.c +++ b/libavformat/omadec.c @@ -309,7 +309,11 @@ static int oma_read_header(AVFormatContext *s) switch (buf[32]) { case OMA_CODECID_ATRAC3: - samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7]*100; + samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100; + if (!samplerate) { + av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n"); + return AVERROR_INVALIDDATA; + } if (samplerate != 44100) avpriv_request_sample(s, "Sample rate %d", samplerate); @@ -339,9 +343,14 @@ static int oma_read_header(AVFormatContext *s) case OMA_CODECID_ATRAC3P: st->codec->channels = (codec_params >> 10) & 7; framesize = ((codec_params & 0x3FF) * 8) + 8; - st->codec->sample_rate = ff_oma_srate_tab[(codec_params >> 13) & 7]*100; - st->codec->bit_rate = st->codec->sample_rate * framesize * 8 / 1024; - avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); + samplerate = ff_oma_srate_tab[(codec_params >> 13) & 7] * 100; + if (!samplerate) { + av_log(s, AV_LOG_ERROR, "Unsupported sample rate\n"); + return AVERROR_INVALIDDATA; + } + st->codec->sample_rate = samplerate; + st->codec->bit_rate = samplerate * framesize * 8 / 1024; + avpriv_set_pts_info(st, 64, 1, samplerate); av_log(s, AV_LOG_ERROR, "Unsupported codec ATRAC3+!\n"); break; case OMA_CODECID_MP3: |