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

avformat/ffmdec: Only return EAGAIN if a server is attached 

This should fix a infinite loop

Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-11-20 03:10:11 +01:00
parent e33d372023
commit 9b7d39de81
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/ffmdec.c
View File

@ -49,7 +49,10 @@ static int ffm_is_avail_data(AVFormatContext *s, int size)
} else { } else {
if (pos == ffm->write_index) { if (pos == ffm->write_index) {
/* exactly at the end of stream */ /* exactly at the end of stream */
return AVERROR(EAGAIN); if (ffm->server_attached)
return AVERROR(EAGAIN);
else
return AVERROR_INVALIDDATA;
} else if (pos < ffm->write_index) { } else if (pos < ffm->write_index) {
avail_size = ffm->write_index - pos; avail_size = ffm->write_index - pos;
} else { } else {
@ -59,8 +62,10 @@ static int ffm_is_avail_data(AVFormatContext *s, int size)
avail_size = (avail_size / ffm->packet_size) * (ffm->packet_size - FFM_HEADER_SIZE) + len; avail_size = (avail_size / ffm->packet_size) * (ffm->packet_size - FFM_HEADER_SIZE) + len;
if (size <= avail_size) if (size <= avail_size)
return 1; return 1;
else else if (ffm->server_attached)
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
else
return AVERROR_INVALIDDATA;
} }
static int ffm_resync(AVFormatContext *s, int state) static int ffm_resync(AVFormatContext *s, int state)