summaryrefslogtreecommitdiffstats
path: root/libavformat/img2dec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-08 20:06:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-08 20:07:16 +0100
commit252316c88598420df1120696f46a532a5ae502a4 (patch)
tree73246c5a0593e010f44ce59fb94fb15bb84677f0 /libavformat/img2dec.c
parent0b68ebc4b6b943ee6b677018a54406daa9b06efc (diff)
downloadffmpeg-streaming-252316c88598420df1120696f46a532a5ae502a4.zip
ffmpeg-streaming-252316c88598420df1120696f46a532a5ae502a4.tar.gz
img2dec: fix -loop
This fixes a infinite loop with -loop and -vframes Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/img2dec.c')
-rw-r--r--libavformat/img2dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c
index de8a64f..c3f5bdb 100644
--- a/libavformat/img2dec.c
+++ b/libavformat/img2dec.c
@@ -393,7 +393,7 @@ static int img_read_packet(AVFormatContext *s1, AVPacket *pkt)
return AVERROR(ENOMEM);
pkt->stream_index = 0;
pkt->flags |= AV_PKT_FLAG_KEY;
- if (!s->is_pipe)
+ if (!s->is_pipe && !s->loop)
pkt->pts = s->img_number - s->img_first;
pkt->size = 0;
OpenPOWER on IntegriCloud