highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ogg: Forward errors further

Browse Source 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato 2015-03-21 16:34:39 +01:00
parent b18346817d
commit 656e31ed87
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/oggdec.c
View File

@ -282,8 +282,11 @@ static int ogg_read_page(AVFormatContext *s, int *str)
os = ogg->streams + idx; os = ogg->streams + idx;
os->page_pos = avio_tell(bc) - 27; os->page_pos = avio_tell(bc) - 27;
if (os->psize > 0) if (os->psize > 0) {
ogg_new_buf(ogg, idx); ret = ogg_new_buf(ogg, idx);
if (ret < 0)
return ret;
}
ret = avio_read(bc, os->segments, nsegs); ret = avio_read(bc, os->segments, nsegs);
if (ret < nsegs) if (ret < nsegs)
@ -503,7 +506,7 @@ static int ogg_get_headers(AVFormatContext *s)
static int ogg_get_length(AVFormatContext *s) static int ogg_get_length(AVFormatContext *s)
{ {
struct ogg *ogg = s->priv_data; struct ogg *ogg = s->priv_data;
int i; int i, ret;
int64_t size, end; int64_t size, end;
if (!s->pb->seekable) if (!s->pb->seekable)
@ -518,7 +521,9 @@ static int ogg_get_length(AVFormatContext *s)
return 0; return 0;
end = size > MAX_PAGE_SIZE ? size - MAX_PAGE_SIZE : 0; end = size > MAX_PAGE_SIZE ? size - MAX_PAGE_SIZE : 0;
ogg_save(s); ret = ogg_save(s);
if (ret < 0)
return ret;
avio_seek(s->pb, end, SEEK_SET); avio_seek(s->pb, end, SEEK_SET);
while (!ogg_read_page(s, &i)) { while (!ogg_read_page(s, &i)) {
@ -570,7 +575,11 @@ static int ogg_read_header(AVFormatContext *s)
ogg->streams[i].codec = NULL; ogg->streams[i].codec = NULL;
//linear granulepos seek from end //linear granulepos seek from end
ogg_get_length(s); ret = ogg_get_length(s);
if (ret < 0) {
ogg_read_close(s);
return ret;
}
//fill the extradata in the per codec callbacks //fill the extradata in the per codec callbacks
return 0; return 0;