highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/gifdec: export sample aspect ratio

Browse Source
This commit is contained in:
Paul B Mahol
2018-12-12 11:12:32 +01:00
parent 3f8cdd4ee3
commit 80f0f8660c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/gifdec.c
View File

@ -99,7 +99,7 @@ static int gif_read_header(AVFormatContext *s)
GIFDemuxContext *gdc = s->priv_data; GIFDemuxContext *gdc = s->priv_data;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVStream *st; AVStream *st;
int width, height, ret; int width, height, ret, n;
if ((ret = resync(pb)) < 0) if ((ret = resync(pb)) < 0)
return ret; return ret;
@ -107,6 +107,8 @@ static int gif_read_header(AVFormatContext *s)
gdc->delay = gdc->default_delay; gdc->delay = gdc->default_delay;
width = avio_rl16(pb); width = avio_rl16(pb);
height = avio_rl16(pb); height = avio_rl16(pb);
avio_skip(pb, 2);
n = avio_r8(pb);
if (width == 0 || height == 0) if (width == 0 || height == 0)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -122,6 +124,10 @@ static int gif_read_header(AVFormatContext *s)
st->codecpar->codec_id = AV_CODEC_ID_GIF; st->codecpar->codec_id = AV_CODEC_ID_GIF;
st->codecpar->width = width; st->codecpar->width = width;
st->codecpar->height = height; st->codecpar->height = height;
if (n) {
st->codecpar->sample_aspect_ratio.num = n + 15;
st->codecpar->sample_aspect_ratio.den = 64;
}
/* jump to start because gif decoder needs header data too */ /* jump to start because gif decoder needs header data too */
if (avio_seek(pb, 0, SEEK_SET) != 0) if (avio_seek(pb, 0, SEEK_SET) != 0)