aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas George <george@nsup.org>2015-11-27 18:58:05 +0100
committerNicolas George <george@nsup.org>2015-12-03 19:16:12 +0100
commit0bac7a436be649b87922d785a840d93f9a8b4b68 (patch)
tree66ec55119d2811f9269447869c77747140613beb
parent3ab1e5a48c53fdecdf50d177d20b6476094cec68 (diff)
downloadffmpeg-0bac7a436be649b87922d785a840d93f9a8b4b68.tar.gz
lavf/flvdec: use FFERROR_REDO instead of AVERROR(EAGAIN).
Fix trac ticket #5041.
-rw-r--r--libavformat/flvdec.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index ca73969315..c003e70bed 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -882,7 +882,7 @@ retry:
}
if (size == 0) {
- ret = AVERROR(EAGAIN);
+ ret = FFERROR_REDO;
goto leave;
}
@@ -927,13 +927,13 @@ retry:
type, size, flags);
skip:
avio_seek(s->pb, next, SEEK_SET);
- ret = AVERROR(EAGAIN);
+ ret = FFERROR_REDO;
goto leave;
}
/* skip empty data packets */
if (!size) {
- ret = AVERROR(EAGAIN);
+ ret = FFERROR_REDO;
goto leave;
}
@@ -973,7 +973,7 @@ skip:
|| st->discard >= AVDISCARD_ALL
) {
avio_seek(s->pb, next, SEEK_SET);
- ret = AVERROR(EAGAIN);
+ ret = FFERROR_REDO;
goto leave;
}
@@ -1068,7 +1068,7 @@ retry_duration:
if (st->codec->extradata) {
if ((ret = flv_queue_extradata(flv, s->pb, stream_type, size)) < 0)
return ret;
- ret = AVERROR(EAGAIN);
+ ret = FFERROR_REDO;
goto leave;
}
if ((ret = flv_get_extradata(s, st, size)) < 0)
@@ -1095,14 +1095,14 @@ retry_duration:
}
}
- ret = AVERROR(EAGAIN);
+ ret = FFERROR_REDO;
goto leave;
}
}
/* skip empty data packets */
if (!size) {
- ret = AVERROR(EAGAIN);
+ ret = FFERROR_REDO;
goto leave;
}