Commit bf1e93bd authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/vivo: Favor setting fps from explicit fractions

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 7b246155
......@@ -121,7 +121,7 @@ static int vivo_get_packet_header(AVFormatContext *s)
static int vivo_read_header(AVFormatContext *s)
{
VivoContext *vivo = s->priv_data;
AVRational fps = { 1, 25};
AVRational fps = { 0 };
AVStream *ast, *vst;
unsigned char *line, *line_end, *key, *value;
long value_int;
......@@ -212,13 +212,16 @@ static int vivo_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA;
value_used = 1;
fps = av_inv_q(av_d2q(d, 10000));
if (!fps.num && !fps.den)
fps = av_inv_q(av_d2q(d, 10000));
}
if (!value_used)
av_dict_set(&s->metadata, key, value, 0);
}
}
if (!fps.num || !fps.den)
fps = (AVRational){ 1, 25 };
avpriv_set_pts_info(ast, 64, 1, ast->codecpar->sample_rate);
avpriv_set_pts_info(vst, 64, fps.num, fps.den);
......
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