[FFmpeg-cvslog] lavf/flvdec: use FFERROR_REDO instead of AVERROR(EAGAIN).
Nicolas George
git at videolan.org
Thu Dec 3 19:22:38 CET 2015
ffmpeg | branch: master | Nicolas George <george at nsup.org> | Fri Nov 27 18:58:05 2015 +0100| [0bac7a436be649b87922d785a840d93f9a8b4b68] | committer: Nicolas George
lavf/flvdec: use FFERROR_REDO instead of AVERROR(EAGAIN).
Fix trac ticket #5041.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bac7a436be649b87922d785a840d93f9a8b4b68
---
libavformat/flvdec.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index ca73969..c003e70 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;
}
More information about the ffmpeg-cvslog
mailing list