RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-11 09:35:22 +00:00
Code Issues Projects Releases Wiki Activity

avformat/matroskadec: Slightly simplify version check

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-07-20 19:14:38 +02:00
parent 880519c1de
commit 6f134c6d17
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/matroskadec.c
View File

@ -2027,12 +2027,12 @@ static int matroska_parse_flac(AVFormatContext *s,
static int mkv_field_order(MatroskaDemuxContext *matroska, int64_t field_order) 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 /* workaround a bug in our Matroska muxer, introduced in version 57.36 alongside
* this function, and fixed in 57.52 */ * this function, and fixed in 57.52 */
if (matroska->muxingapp && sscanf(matroska->muxingapp, "Lavf%d.%d.%d", &major, &minor, &micro) == 3) if (matroska->muxingapp && sscanf(matroska->muxingapp, "Lavf57.%d.%d", &minor, &micro) == 2)
bttb = (major == 57 && minor >= 36 && minor <= 51 && micro >= 100); bttb = (minor >= 36 && minor <= 51 && micro >= 100);
switch (field_order) { switch (field_order) {
case MATROSKA_VIDEO_FIELDORDER_PROGRESSIVE: case MATROSKA_VIDEO_FIELDORDER_PROGRESSIVE: