[FFmpeg-devel] [PATCH 1/2] ffmdec: only seek back at EOF if a server is attached

[Andreas Cadhalpun]

Otherwise the ffm demuxer can return the same packets endlessly, if
there is no server attached.
---

I haven't tested ffserver, but since it sets server_attached, it
should still work as previously.

---
 libavformat/ffmdec.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index e7c1449..9ad771e 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -100,7 +100,10 @@ static int ffm_read_data(AVFormatContext *s,
             len = size;
         if (len == 0) {
             if (avio_tell(pb) == ffm->file_size)
-                avio_seek(pb, ffm->packet_size, SEEK_SET);
+                if (ffm->server_attached)
+                    avio_seek(pb, ffm->packet_size, SEEK_SET);
+                else
+                    return AVERROR_EOF;
     retry_read:
             if (pb->buffer_size != ffm->packet_size) {
                 int64_t tell = avio_tell(pb);
-- 
2.6.2