summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2021-12-06 11:38:39 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2022-04-06 20:38:05 +0200
commit480f1a198cbfe72fb8f59a5e664c2af796f4a45c (patch)
tree44b1b8f3b39820d4cee2707e44c414cac20a6fee
parentdeba3d03723de72c386bdcc2db5ac733bd05adc7 (diff)
downloadffmpeg-480f1a198cbfe72fb8f59a5e664c2af796f4a45c.tar.gz
avformat/vivo: Favor setting fps from explicit fractions
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit bf1e93bdc9aaa4fd5c231030b5368aae0df018ee) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/vivo.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libavformat/vivo.c b/libavformat/vivo.c
index 12bdc05d9e..78d1377e6b 100644
--- a/libavformat/vivo.c
+++ b/libavformat/vivo.c
@@ -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);