diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-20 19:14:38 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-24 04:25:45 +0200 |
| commit | 6f134c6d17e5888f0b9e2a414139685c45ddda0f (patch) | |
| tree | c7486feac329c849ad0283e37bb2758f5af569ce | |
| parent | 880519c1de3f2bfad04e6fef93e0bf41129ff99e (diff) | |
| download | ffmpeg-6f134c6d17e5888f0b9e2a414139685c45ddda0f.tar.gz | |
avformat/matroskadec: Slightly simplify version check
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/matroskadec.c | 6 |
1 files changed, 3 insertions, 3 deletions
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: |