virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavf/flvdec: use FFERROR_REDO instead of AVERROR(EAGAIN).

Browse Source 
Fix trac ticket #5041.
This commit is contained in:
Nicolas George
2015-11-27 18:58:05 +01:00
parent 3ab1e5a48c
commit 0bac7a436b
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/flvdec.c
View File

@@ -882,7 +882,7 @@ retry:
} }
if (size == 0) { if (size == 0) {
ret = AVERROR(EAGAIN); ret = FFERROR_REDO;
goto leave; goto leave;
} }
@@ -927,13 +927,13 @@ retry:
type, size, flags); type, size, flags);
skip: skip:
avio_seek(s->pb, next, SEEK_SET); avio_seek(s->pb, next, SEEK_SET);
ret = AVERROR(EAGAIN); ret = FFERROR_REDO;
goto leave; goto leave;
} }
/* skip empty data packets */ /* skip empty data packets */
if (!size) { if (!size) {
ret = AVERROR(EAGAIN); ret = FFERROR_REDO;
goto leave; goto leave;
} }
@@ -973,7 +973,7 @@ skip:
|| st->discard >= AVDISCARD_ALL || st->discard >= AVDISCARD_ALL
) { ) {
avio_seek(s->pb, next, SEEK_SET); avio_seek(s->pb, next, SEEK_SET);
ret = AVERROR(EAGAIN); ret = FFERROR_REDO;
goto leave; goto leave;
} }
@@ -1068,7 +1068,7 @@ retry_duration:
if (st->codec->extradata) { if (st->codec->extradata) {
if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0) if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0)
return ret; return ret;
ret = AVERROR(EAGAIN); ret = FFERROR_REDO;
goto leave; goto leave;
} }
if ((ret = flv_get_extradata(s, st, size)) < 0) if ((ret = flv_get_extradata(s, st, size)) < 0)
@@ -1095,14 +1095,14 @@ retry_duration:
} }
} }
ret = AVERROR(EAGAIN); ret = FFERROR_REDO;
goto leave; goto leave;
} }
} }
/* skip empty data packets */ /* skip empty data packets */
if (!size) { if (!size) {
ret = AVERROR(EAGAIN); ret = FFERROR_REDO;
goto leave; goto leave;
} }