From patchwork Tue Nov 2 11:51:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 31275 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5e:a610:0:0:0:0:0 with SMTP id q16csp3892138ioi; Tue, 2 Nov 2021 04:53:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwraOmact4V1i8uxf7r4jQtqWd0BmGDjFDfdtBij1sLNvWPdOqwCzBe+ba+eTrhBfMnVgn/ X-Received: by 2002:a05:6402:268a:: with SMTP id w10mr50342994edd.351.1635853998530; Tue, 02 Nov 2021 04:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635853998; cv=none; d=google.com; s=arc-20160816; b=NpPNNvt3ld7rE5Wypw0VThGPrDizv5+qfYDo5ohNmFR9sNDnHeHcmK6Y11osHWGOtS V6jHuZK4G2JseffLus44CwcU+zOtURq+/+J3IJY3TzbV97TUJGZntphkSWFpVPzllD6m G8dQ/R7sA37PUGOWxtBRk8JdFvrn3LhEKqnTyYOLY2ZlnOzFMs5YESqKjp00GNxkslo7 8SbeiBoFF/OZ8MhQXemGY71400LzGGs5dfRHcruoD9YOcmICYdQ2Tw29zIme9aqWZuek rBnkE4gWrf+6OD2qRZTI7b9Rp6kaRY5aak9KCq5MbRptCXK1ksTVRgrC7QAb+gzJU0an ndyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=h1Rk3YMJd1ut4Oo0TU5xwx0xnd9jf+DTbho0LyBUoQg=; b=XpW/YFK/a1MijWcwX5S8FdB9WhBaUnMeTAu+bAGlQAFAH26IICHU6URT5cUf3szTgB cAdEGIOCE120bRmSFVJlfo/cQYQlzxgXgoVPlqtDs5VjAkonP/gxqPEXAEYyNu97wcsY 5Ph0N9OJwyePW2rXgE9hbwy9daRaoJe123FinJVoANBSL6FyHsjghsAMYCDrleBbRlqz BSprFn81Fbj0BRJqgR7IZK+mwHBphCDrv42hP0vARNthQmcfGBqTyDnDZ7Hk7r2SO63a gCLgFm/hNXvuJhdynvXT0Y591MyhXQwNg+73C+y67+5X0Wr3ybuqEm1MraamPmU5wI8l udvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XDWWWpLl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ho36si14692940ejc.607.2021.11.02.04.53.18; Tue, 02 Nov 2021 04:53:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=XDWWWpLl; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEFC5689FB2; Tue, 2 Nov 2021 13:53:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF285689FCE for ; Tue, 2 Nov 2021 13:53:02 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id h14so17755670qtb.3 for ; Tue, 02 Nov 2021 04:53:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5CNekyV+ryJSaVurmUiSloU+XDWs7qolD3g365QxWgk=; b=XDWWWpLljGi3i8Pm5ikdhvwmqZGbPdZlZ8l4finX9wai6FE0YqgUDgr/Po8c10qLYQ OfxvbVEtt1nT1CnWhLMs8l3HCRwhLtRs8nnxmIv1Og53bhjMJC7S5Mtq2OIkUtMfJIeV gZaUkIYjU1vzEU+Ahoml2gQZGq2rutGBIbDf7heO4c1WfiCbruotJ46AHOSwePrLQOGU ps/atTGPT+EUddy5SnnQ2Tmw+JcCFy21aJnNx0ke3Uw1HBFOh1nIiB4jT6EKFMPNpBN1 xs+rsispw6TQfeJTmK30LuiKv8vDcb+8uvXYmFW/gNlt4naTPy4hJBNRPItirjF3qPpf V0ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5CNekyV+ryJSaVurmUiSloU+XDWs7qolD3g365QxWgk=; b=0I2wpEbfmiBMPOazJVnlHXuyHnuY250RS6jUfPkiQ5GBrKUzcPG886RuDamxLf2e6h sptCzLSIfT+2MQ7NBonJBvaivlZMbeJO0ejkt0jbC4Wkbw3g5M+6Rrq/+eqSnhjvtrrz nTFh9giOfFwGaAi1dpJYLEDl+EQrzDqUG96KFVkPhFUFtkJ1lcKHhMZnc6Nalw6C8H2L XbMxhnJXSRyiv9G4oS9NkKqbk14s2sSFn9Q01dDrxCacRjNTqjOHKg84tan1ydiSsL7l cDkIZl6SWCPzVJpPihy/Ph56iHProfcBy5jhyrdT1f3hThQQfj4fpQsrxImNuA47CawG NEqQ== X-Gm-Message-State: AOAM530bynu7G8XGYzhMR0A+AFf2B3l4kQfMO9/eJVqlqeiUcYoquZRb B7sw4HfesIDU5Ki+uKswZII9D8JvgV2kPA== X-Received: by 2002:ac8:5f8d:: with SMTP id j13mr37969436qta.108.1635853981603; Tue, 02 Nov 2021 04:53:01 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id c16sm1107446qte.95.2021.11.02.04.53.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 04:53:01 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Nov 2021 07:51:52 -0400 Message-Id: <20211102115152.132482-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211102115152.132482-1-leo.izen@gmail.com> References: <20211102115152.132482-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/2] avformat/image2: add JPEG XL image2 demuxer and muxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: j8Ue4+R208JS Add JPEG XL image demuxer and muxer to image2 to allow JPEG XL files to be read/written by libavformat. --- libavformat/allformats.c | 1 + libavformat/img2.c | 1 + libavformat/img2dec.c | 336 +++++++++++++++++++++++++++++++++++++++ libavformat/img2enc.c | 6 +- libavformat/mov.c | 1 + 5 files changed, 342 insertions(+), 3 deletions(-) diff --git a/libavformat/allformats.c b/libavformat/allformats.c index cbfadcb639..fedce9493c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -505,6 +505,7 @@ extern const AVInputFormat ff_image_gif_pipe_demuxer; extern const AVInputFormat ff_image_j2k_pipe_demuxer; extern const AVInputFormat ff_image_jpeg_pipe_demuxer; extern const AVInputFormat ff_image_jpegls_pipe_demuxer; +extern const AVInputFormat ff_image_jpegxl_pipe_demuxer; extern const AVInputFormat ff_image_pam_pipe_demuxer; extern const AVInputFormat ff_image_pbm_pipe_demuxer; extern const AVInputFormat ff_image_pcx_pipe_demuxer; diff --git a/libavformat/img2.c b/libavformat/img2.c index 4153102c92..d8751d66bf 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -31,6 +31,7 @@ const IdStrMap ff_img_tags[] = { { AV_CODEC_ID_MJPEG, "mpo" }, { AV_CODEC_ID_LJPEG, "ljpg" }, { AV_CODEC_ID_JPEGLS, "jls" }, + { AV_CODEC_ID_JPEGXL, "jxl" }, { AV_CODEC_ID_PNG, "png" }, { AV_CODEC_ID_PNG, "pns" }, { AV_CODEC_ID_PNG, "mng" }, diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index b535831e1c..5f48e0dde6 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -830,6 +830,341 @@ static int jpegls_probe(const AVProbeData *p) return 0; } +#define jxl_bits(bc) (tbits += (bc), ((p->buf_size + AVPROBE_PADDING_SIZE) * 8 < tbits) ? 0 : (AV_RL64(p->buf + (tbits-(bc))/8) >> ((tbits-(bc)) % 8)) & ~(~(uint64_t)0 << (bc))) + +static inline uint32_t ff_jxl_ratio(uint32_t h, uint32_t ratio){ + switch (ratio){ + case 1: + return h; + case 2: + return (uint32_t)(((uint64_t)h * 12) / 10); + case 3: + return (uint32_t)(((uint64_t)h * 4) / 3); + case 4: + return (uint32_t)(((uint64_t)h * 3) / 2); + case 5: + return (uint32_t)(((uint64_t)h * 16) / 9); + case 6: + return (uint32_t)(((uint64_t)h * 5) / 4); + case 7: + return (uint32_t)(((uint64_t)h * 2) / 1); + default: + /* width coded separately */ + return 0; + } +} + +static inline uint32_t ff_jxl_u32(const AVProbeData *p, size_t *tbitsp, uint32_t *c, uint32_t *u) +{ + size_t tbits; + uint32_t bits, ret; + tbits = *tbitsp; + bits = jxl_bits(2); + ret = c[bits]; + if (u[bits]) + ret += jxl_bits(u[bits]); + *tbitsp = tbits; + return ret; +} + +static inline uint64_t ff_jxl_u64(const AVProbeData *p, size_t *tbitsp) +{ + size_t tbits; + uint64_t bits, ret, shift = 12; + tbits = *tbitsp; + bits = jxl_bits(2); + switch (bits) { + case 0: + ret = 0; + break; + case 1: + ret = 1 + jxl_bits(4); + break; + case 2: + ret = 17 + jxl_bits(8); + break; + case 3: + ret = jxl_bits(12); + while (jxl_bits(1)){ + if (shift < 60) { + ret |= jxl_bits(8) << shift; + shift += 8; + } else { + ret |= jxl_bits(4) << shift; + break; + } + } + break; + } + *tbitsp = tbits; + return ret; +} + +static inline uint32_t ff_jxl_bitdepth(const AVProbeData *p, size_t *tbitsp){ + size_t tbits; + uint32_t ret; + tbits = *tbitsp; + if (jxl_bits(1)) { + /* float */ + ret = ff_jxl_u32(p, &tbits, (uint32_t[]){32, 16, 24, 1}, (uint32_t[]){0, 0, 0, 6}); + tbits += 4; + } else { + /* integer */ + ret = ff_jxl_u32(p, &tbits, (uint32_t[]){8, 10, 12, 1}, (uint32_t[]){0, 0, 0, 6}); + } + *tbitsp = tbits; + return ret; +} + +static size_t ff_jxl_size_header(const AVProbeData *p, size_t start_bits, uint32_t *w, uint32_t *h) +{ + size_t tbits; + uint32_t wr = 0, hr; + tbits = start_bits; + if (jxl_bits(1)) { + /* small size header */ + hr = (jxl_bits(5) + 1) << 3; + /* ratio */ + wr = ff_jxl_ratio(hr, jxl_bits(3)); + if (!wr){ + wr = (jxl_bits(5) + 1) << 3; + } + } else { + /* full size header */ + hr = 1 + ff_jxl_u32(p, &tbits, (uint32_t[]){0, 0, 0, 0}, (uint32_t[]){9, 13, 18, 30}); + /* ratio */ + wr = ff_jxl_ratio(hr, jxl_bits(3)); + if (!wr){ + wr = 1 + ff_jxl_u32(p, &tbits, (uint32_t[]){0, 0, 0, 0}, (uint32_t[]){9, 13, 18, 30}); + } + } + if (hr > (1 << 18) || wr > (1 << 18)) + /* + * raw JXL codestream files capped at level 5 + * a violation is a false positive + * level 5 mandates that w, h <= 2^18 + */ + return 0; + if ((hr >> 4) * (wr >> 4) > (1 << 20)) + /* + * (h >> 4) * (w >> 4) avoids uint32_t overflow + * level 5 also mandates that w * h <= 2^28 + */ + return 0; + *h = hr; + *w = wr; + return tbits - start_bits; +} + +static int jpegxl_probe(const AVProbeData *p) +{ + const uint8_t *b = p->buf; + uint32_t w, h; + int all_default, extra_fields = 0, xyb = 1; + size_t tbits = 16, bits, pbits, bonus; + uint64_t count; + + /* ISOBMFF-based container */ + /* 0x4a584c20 == "JXL " */ + if (AV_RB64(b) == 0x0000000c4a584c20) + return AVPROBE_SCORE_EXTENSION + 1; + /* Codestreams all start with 0xff0a */ + if (AV_RB16(b) != 0xff0a) + return 0; + pbits = ff_jxl_size_header(p, tbits, &w, &h); + if (pbits) + tbits += pbits; + else + /* invalid size header */ + return 0; + + /* all_default */ + all_default = jxl_bits(1); + if (!all_default) + extra_fields = jxl_bits(1); + + if (extra_fields) { + /* orientation */ + tbits += 3; + /* have intrinstic size */ + if (jxl_bits(1)) { + pbits = ff_jxl_size_header(p, tbits, &w, &h); + if (pbits) + tbits += pbits; + else + return 0; + } + /* have preview */ + if (jxl_bits(1)) { + /* div8 */ + bits = jxl_bits(1); + if (bits) + h = ff_jxl_u32(p, &tbits, (uint32_t[]){16, 32, 1, 33}, (uint32_t[]){0, 0, 5, 9}); + else + h = ff_jxl_u32(p, &tbits, (uint32_t[]){1, 65, 321, 1345}, (uint32_t[]){6, 8, 10, 12}); + if (h > 4096) + /* invalid for preview headers */ + return 0; + /* ratio */ + w = ff_jxl_ratio(h, jxl_bits(3)); + if (!w){ + if (bits) + w = ff_jxl_u32(p, &tbits, (uint32_t[]){16, 32, 1, 33}, (uint32_t[]){0, 0, 5, 9}); + else + w = ff_jxl_u32(p, &tbits, (uint32_t[]){1, 65, 321, 1345}, (uint32_t[]){6, 8, 10, 12}); + } + if (w > 4096) + /* invalid for preview headers */ + return 0; + } + /* have animation */ + if (jxl_bits(1)) { + /* timebase */ + ff_jxl_u32(p, &tbits, (uint32_t[]){100, 1000, 1, 1}, (uint32_t[]){0, 0, 10, 30}); + ff_jxl_u32(p, &tbits, (uint32_t[]){1, 1001, 1, 1}, (uint32_t[]){0, 0, 8, 10}); + /* loopcount */ + ff_jxl_u32(p, &tbits, (uint32_t[]){0, 0, 0, 0}, (uint32_t[]){0, 3, 16, 32}); + /* PTS present */ + tbits += 1; + } + } + + if (!all_default) { + /* bit depth */ + ff_jxl_bitdepth(p, &tbits); + /* modular 16-bit */ + tbits += 1; + /* extra channel count */ + count = ff_jxl_u32(p, &tbits, (uint32_t[]){0, 1, 2, 1}, (uint32_t[]){0, 0, 4, 12}); + for (int i = 0; i < count; i++){ + if (!jxl_bits(1)){ + /* type */ + bits = ff_jxl_u32(p, &tbits, (uint32_t[]){0, 1, 2, 18}, (uint32_t[]){0, 0, 4, 6}); + if (bits > 63) + /* enum types cannot be 64+ */ + return 0; + /* bit depth */ + ff_jxl_bitdepth(p, &tbits); + /* dimension shift */ + ff_jxl_u32(p, &tbits, (uint32_t[]){0, 3, 4, 1}, (uint32_t[]){0, 0, 0, 3}); + /* name len */ + pbits = ff_jxl_u32(p, &tbits, (uint32_t[]){0, 0, 16, 48}, (uint32_t[]){0, 4, 5, 10}); + /* name, UTF-8 (not parsing it) */ + tbits += 8 * pbits; + /* alpha channel */ + if (bits == 1) + /* alpha premultiplied */ + tbits += 1; + /* spot color channel */ + if (bits == 2) + /* RGB+S */ + tbits += 16 * 4; + /* color filter array channel */ + if (bits == 5) + ff_jxl_u32(p, &tbits, (uint32_t[]){1, 0, 3, 19}, (uint32_t[]){0, 2, 4, 8}); + } + } + xyb = jxl_bits(1); + /* color encoding */ + if (!jxl_bits(1)) { + /* icc profile */ + bonus = jxl_bits(1); + bits = ff_jxl_u32(p, &tbits, (uint32_t[]){0, 1, 2, 18}, (uint32_t[]){0, 0, 4, 6}); + if (bits > 63) + return 0; + if (!bonus){ + /* bits == 2 -> XYB color space */ + if (bits != 2) + /* white point */ + pbits = ff_jxl_u32(p, &tbits, (uint32_t[]){0, 1, 2, 18}, (uint32_t[]){0, 0, 4, 6}); + else + pbits = 1; + if (pbits > 63) + return 0; + /* custom white point */ + if (pbits == 2) { + for (int i = 0; i < 2; i++) + ff_jxl_u32(p, &tbits, (uint32_t[]){0, 524288, 1048576, 2097152}, (uint32_t[]){19, 19, 20, 21}); + } + /* bits == 1 -> grayscale */ + if (bits != 2 && bits != 1) + /* primaries */ + pbits = ff_jxl_u32(p, &tbits, (uint32_t[]){0, 1, 2, 18}, (uint32_t[]){0, 0, 4, 6}); + if (pbits > 63) + return 0; + /* custom primaries */ + if (pbits == 2){ + for (int i = 0; i < 6; i++) + ff_jxl_u32(p, &tbits, (uint32_t[]){0, 524288, 1048576, 2097152}, (uint32_t[]){19, 19, 20, 21}); + } + /* gamma is present */ + if (jxl_bits(1)){ + /* gamma */ + tbits += 24; + } else { + /* transfer function */ + if (ff_jxl_u32(p, &tbits, (uint32_t[]){0, 1, 2, 18}, (uint32_t[]){0, 0, 4, 6}) > 63) + return 0; + } + /* rendering intent */ + if (ff_jxl_u32(p, &tbits, (uint32_t[]){0, 1, 2, 18}, (uint32_t[]){0, 0, 4, 6}) > 63) + return 0; + } + } + } + + /* tone mapping */ + if (extra_fields){ + /* everything default */ + if (!jxl_bits(1)){ + /* three 16-bit fields and a bool */ + tbits += 16 * 3 + 1; + } + } + + /* extensions */ + if (!all_default){ + count = ff_jxl_u64(p, &tbits); + while (count){ + if (count & 1) + ff_jxl_u64(p, &tbits); + count >>= 1; + } + } + + /* default transform */ + bonus = jxl_bits(1); + if (!bonus && xyb){ + /* opsin inverse matrix */ + bits = jxl_bits(1); + if (!bits){ + /* 16 fields, 16 bits each */ + tbits += 16 * 16; + } + bits = jxl_bits(3); + } else { + bits = 0; + } + if (bits & 1) + tbits += 16 * 15; + if (bits & 2) + tbits += 16 * 55; + if (bits & 4) + tbits += 16 * 210; + bits = tbits % 8; + if (bits) + bits = jxl_bits(8 - bits); + if (bits) + /* header is zero padded to the byte */ + return 0; + + if (p->buf_size < (tbits - 1) / 8 + 2) + /* file too small */ + return 0; + return AVPROBE_SCORE_EXTENSION + 1; +} +#undef jxl_bits + static int pcx_probe(const AVProbeData *p) { const uint8_t *b = p->buf; @@ -1149,6 +1484,7 @@ IMAGEAUTO_DEMUXER(gif, AV_CODEC_ID_GIF) IMAGEAUTO_DEMUXER(j2k, AV_CODEC_ID_JPEG2000) IMAGEAUTO_DEMUXER(jpeg, AV_CODEC_ID_MJPEG) IMAGEAUTO_DEMUXER(jpegls, AV_CODEC_ID_JPEGLS) +IMAGEAUTO_DEMUXER(jpegxl, AV_CODEC_ID_JPEGXL) IMAGEAUTO_DEMUXER(pam, AV_CODEC_ID_PAM) IMAGEAUTO_DEMUXER(pbm, AV_CODEC_ID_PBM) IMAGEAUTO_DEMUXER(pcx, AV_CODEC_ID_PCX) diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 62202de9f4..72e64da984 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -259,9 +259,9 @@ static const AVClass img2mux_class = { const AVOutputFormat ff_image2_muxer = { .name = "image2", .long_name = NULL_IF_CONFIG_SMALL("image2 sequence"), - .extensions = "bmp,dpx,exr,jls,jpeg,jpg,ljpg,pam,pbm,pcx,pfm,pgm,pgmyuv,png," - "ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8,im24," - "sunras,xbm,xface,pix,y", + .extensions = "bmp,dpx,exr,jls,jpeg,jpg,jxl,ljpg,pam,pbm,pcx,pfm,pgm,pgmyuv," + "png,ppm,sgi,tga,tif,tiff,jp2,j2c,j2k,xwd,sun,ras,rs,im1,im8," + "im24,sunras,xbm,xface,pix,y", .priv_data_size = sizeof(VideoMuxData), .video_codec = AV_CODEC_ID_MJPEG, .write_header = write_header, diff --git a/libavformat/mov.c b/libavformat/mov.c index 57c67e3aac..3a23f5dad8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -7437,6 +7437,7 @@ static int mov_probe(const AVProbeData *p) if (tag == MKTAG('f','t','y','p') && ( AV_RL32(p->buf + offset + 8) == MKTAG('j','p','2',' ') || AV_RL32(p->buf + offset + 8) == MKTAG('j','p','x',' ') + || AV_RL32(p->buf + offset + 8) == MKTAG('j','x','l',' ') )) { score = FFMAX(score, 5); } else {