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

Merge commit '656e31ed8728b0c095d037dc9764fc8137c87200' 

* commit '656e31ed8728b0c095d037dc9764fc8137c87200':
  ogg: Forward errors further

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-20 22:09:04 +02:00
parent a5379d6e68 656e31ed87
commit 3cd6f4546a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/oggdec.c
View File

@ -584,10 +584,9 @@ static int ogg_packet(AVFormatContext *s, int *sid, int *dstart, int *dsize,
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;
int streams_left=0; int streams_left=0;
int ret;
if (!s->pb->seekable) if (!s->pb->seekable)
return 0; return 0;
@ -707,7 +706,11 @@ static int ogg_read_header(AVFormatContext *s)
} }
//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;
}
return 0; return 0;
} }