[FFmpeg-cvslog] avformat/img2dec: Support -loop with pipes

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Oct  5 01:49:25 2014 +0200| [b02e4faa3ef9384c7d6a307e518e6446b045fb98] | committer: Michael Niedermayer

avformat/img2dec: Support -loop with pipes

Fixes Ticket3976

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 684508ba15ca15d5d43f67bbed483ce5b6617f10)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b02e4faa3ef9384c7d6a307e518e6446b045fb98
---

 libavformat/img2dec.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index 70bef9d..ee484f6 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -421,6 +421,8 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
             infer_size(&codec->width, &codec->height, size[0]);
     } else {
         f[0] = s1->pb;
+        if (avio_feof(f[0]) && s->loop && s->is_pipe)
+            avio_seek(f[0], 0, SEEK_SET);
         if (avio_feof(f[0]))
             return AVERROR_EOF;
         if (s->frame_size > 0) {
@@ -457,6 +459,12 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
     for (i = 0; i < 3; i++) {
         if (f[i]) {
             ret[i] = avio_read(f[i], pkt->data + pkt->size, size[i]);
+            if (s->loop && s->is_pipe && ret[i] == AVERROR_EOF) {
+                if (avio_seek(f[i], 0, SEEK_SET) >= 0) {
+                    pkt->pos = 0;
+                    ret[i] = avio_read(f[i], pkt->data + pkt->size, size[i]);
+                }
+            }
             if (!s->is_pipe)
                 avio_close(f[i]);
             if (ret[i] > 0)