generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/img2dec: Support -loop with pipes

Browse Source 
Fixes Ticket3976

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-05 01:49:25 +02:00
parent 550f3e9df3
commit 684508ba15
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/img2dec.c
View File

@@ -421,6 +421,8 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
infer_size(&codec->width, &codec->height, size[0]); infer_size(&codec->width, &codec->height, size[0]);
} else { } else {
f[0] = s1->pb; 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])) if (avio_feof(f[0]))
return AVERROR_EOF; return AVERROR_EOF;
if (s->frame_size > 0) { if (s->frame_size > 0) {
@@ -457,6 +459,12 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (f[i]) { if (f[i]) {
ret[i] = avio_read(f[i], pkt->data + pkt->size, size[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) if (!s->is_pipe)
avio_close(f[i]); avio_close(f[i]);
if (ret[i] > 0) if (ret[i] > 0)