virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

oggparsespeex: validate channel count and set channel layout

Browse Source
This commit is contained in:
Justin Ruggles
2012-04-07 17:39:30 -04:00
parent 232e9c4c4b
commit d4088efbe2
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/oggparsespeex.c
View File

@@ -25,6 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "libavutil/bswap.h" #include "libavutil/bswap.h"
#include "libavutil/avstring.h" #include "libavutil/avstring.h"
#include "libavutil/channel_layout.h"
#include "libavcodec/get_bits.h" #include "libavcodec/get_bits.h"
#include "libavcodec/bytestream.h" #include "libavcodec/bytestream.h"
#include "avformat.h" #include "avformat.h"
@@ -59,6 +60,12 @@ static int speex_header(AVFormatContext *s, int idx) {
st->codec->sample_rate = AV_RL32(p + 36); st->codec->sample_rate = AV_RL32(p + 36);
st->codec->channels = AV_RL32(p + 48); st->codec->channels = AV_RL32(p + 48);
if (st->codec->channels < 1 || st->codec->channels > 2) {
av_log(s, AV_LOG_ERROR, "invalid channel count. Speex must be mono or stereo.\n");
return AVERROR_INVALIDDATA;
}
st->codec->channel_layout = st->codec->channels == 1 ? AV_CH_LAYOUT_MONO :
AV_CH_LAYOUT_STEREO;
spxp->packet_size = AV_RL32(p + 56); spxp->packet_size = AV_RL32(p + 56);
frames_per_packet = AV_RL32(p + 64); frames_per_packet = AV_RL32(p + 64);