Browse Source

Fix Speex header parsing in ogg demuxer

Originally committed as revision 18101 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
David Conrad 16 years ago
parent
commit
6e6abd0237
1 changed files with 6 additions and 3 deletions
  1. +6
    -3
      libavformat/oggparsespeex.c

+ 6
- 3
libavformat/oggparsespeex.c View File

@@ -36,9 +36,10 @@ static int speex_header(AVFormatContext *s, int idx) {
AVStream *st = s->streams[idx];
uint8_t *p = os->buf + os->pstart;

if (os->psize < 80)
return 1;
if (os->seq > 1)
return 0;

if (os->seq == 0) {
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_SPEEX;

@@ -50,8 +51,10 @@ static int speex_header(AVFormatContext *s, int idx) {

st->time_base.num = 1;
st->time_base.den = st->codec->sample_rate;
} else
vorbis_comment(s, p, os->psize);

return 0;
return 1;
}

const struct ogg_codec ff_speex_codec = {


Loading…
Cancel
Save