Commit 46f15de8 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/gifdec: correct r_frame_rate for single frame gifs

Fixes Ticket4650
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 8c75a338
......@@ -52,6 +52,9 @@ typedef struct GIFDemuxContext {
int total_iter;
int iter_count;
int ignore_loop;
int nb_frames;
int last_duration;
} GIFDemuxContext;
/**
......@@ -279,6 +282,9 @@ parse_keyframe:
pkt->stream_index = 0;
pkt->duration = gdc->delay;
gdc->nb_frames ++;
gdc->last_duration = pkt->duration;
/* Graphic Control Extension's scope is single frame.
* Remove its influence. */
gdc->delay = gdc->default_delay;
......@@ -299,6 +305,9 @@ resync:
}
if ((ret >= 0 && !frame_parsed) || ret == AVERROR_EOF) {
if (gdc->nb_frames == 1) {
s->streams[0]->r_frame_rate = (AVRational) {100, gdc->last_duration};
}
/* This might happen when there is no image block
* between extension blocks and GIF_TRAILER or EOF */
if (!gdc->ignore_loop && (block_label == GIF_TRAILER || avio_feof(pb))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment