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

avformat/gifdec: correct r_frame_rate for single frame gifs

Browse Source 
Fixes Ticket4650

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-08-10 04:18:21 +02:00
parent 8c75a33812
commit 46f15de8a4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/gifdec.c
View File

@ -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))