RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

oggparsetheora: make it more robust

This commit is contained in:
Luca Barbato 2012-09-20 01:33:47 +02:00
parent bb146bb57b
commit 0336dea2ef
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/oggparsetheora.c
View File

@ -53,7 +53,8 @@ theora_header (AVFormatContext * s, int idx)
os->private = thp; os->private = thp;
} }
if (os->buf[os->pstart] == 0x80) { switch (os->buf[os->pstart]) {
case 0x80: {
GetBitContext gb; GetBitContext gb;
int width, height; int width, height;
AVRational timebase; AVRational timebase;
@ -110,8 +111,16 @@ theora_header (AVFormatContext * s, int idx)
st->codec->codec_id = AV_CODEC_ID_THEORA; st->codec->codec_id = AV_CODEC_ID_THEORA;
st->need_parsing = AVSTREAM_PARSE_HEADERS; st->need_parsing = AVSTREAM_PARSE_HEADERS;
} else if (os->buf[os->pstart] == 0x83) { }
break;
case 0x81:
ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 8); ff_vorbis_comment(s, &st->metadata, os->buf + os->pstart + 7, os->psize - 8);
case 0x82:
if (!thp->version)
return -1;
break;
default:
return -1;
} }
st->codec->extradata = av_realloc (st->codec->extradata, st->codec->extradata = av_realloc (st->codec->extradata,