From 6f134c6d17e5888f0b9e2a414139685c45ddda0f Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 20 Jul 2020 19:14:38 +0200 Subject: avformat/matroskadec: Slightly simplify version check Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libavformat/matroskadec.c') diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 6abb5412de..b1ef344aa7 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2027,12 +2027,12 @@ static int matroska_parse_flac(AVFormatContext *s, static int mkv_field_order(MatroskaDemuxContext *matroska, int64_t field_order) { - int major, minor, micro, bttb = 0; + int minor, micro, bttb = 0; /* workaround a bug in our Matroska muxer, introduced in version 57.36 alongside * this function, and fixed in 57.52 */ - if (matroska->muxingapp && sscanf(matroska->muxingapp, "Lavf%d.%d.%d", &major, &minor, µ) == 3) - bttb = (major == 57 && minor >= 36 && minor <= 51 && micro >= 100); + if (matroska->muxingapp && sscanf(matroska->muxingapp, "Lavf57.%d.%d", &minor, µ) == 2) + bttb = (minor >= 36 && minor <= 51 && micro >= 100); switch (field_order) { case MATROSKA_VIDEO_FIELDORDER_PROGRESSIVE: -- cgit v1.2.3