From patchwork Mon Mar 22 02:06:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 26527 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id EACC244855F for ; Mon, 22 Mar 2021 04:06:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C86DC68AA0D; Mon, 22 Mar 2021 04:06:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C399168A9C9 for ; Mon, 22 Mar 2021 04:06:41 +0200 (EET) Received: by mail-ed1-f51.google.com with SMTP id bf3so17440323edb.6 for ; Sun, 21 Mar 2021 19:06:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:reply-to:mime-version :content-transfer-encoding; bh=5FJ6yGPv9MyqyUTTq/mdvQhu8m3xcJJQvvMBNRnM4F8=; b=DUWIHy1jS28uXct8zJWWkDs0s3WnAU8vDGxPgwjNF8k7ixfUC/b+ZSUE7MePrp5kJt tDnf4p82U3Xa+ep604K+r/t12WdPXsorDakn2dWibjnsVUpguViWaMnwjOuZ1zaJUnVZ r31AfVZHGgXXc8P6EJ9frj5up1NgrnykiiIgZ52xI4KNWPbfV3NO3iXalEvTNYqUZDeK Q038LEpGTqhLXhVdZ0xv74Y2gQfg+5/mJotLoq0Gv01q8O2WHkcolt88zGCxkVd8x+j7 khGunkABnPEdmq30TfXWPQc2osXy4YKobDKn2CiZ+2b7n3drwD2I5B6w2fhU2/hSS+xD ewsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=5FJ6yGPv9MyqyUTTq/mdvQhu8m3xcJJQvvMBNRnM4F8=; b=LDKbo/w3+eiPXhsGpvqcxiZwEeIQEFioIsJ8YBgLYfvHa82JAHyANok4xUhtlvhz3y faoj4v63UHmYwCpB1ho8cR9dJNEUTYvzhXMkfnvkHg6/enm5U7UqW3+1t96jwTL6hvsM xn4vu4J8CtDl5tMWzACjVB+rQsi90il5jkewPRBZDOneEf7mkXzv6B1QLWjKxcjyXSCv jVt+J+78Ay8akpgY3BD7igDN/lVh6It/DIQw/qH7/YI44JlYqP9Y687L6i1SZRtG8cvm VmWwD0ohtrXsI8d9oAc/41+6omtJguflHFXjC8LikOruyGXvnJIwVU8FIpOX5z76ThUZ ejag== X-Gm-Message-State: AOAM530PacRyxB5yimUpPvoCOvOQb0wj+n60Yo9edd45DZ4CTFz7gIAG dCBFOgLxc1P+2sKCOCFWolJ4yrbN2sexhg== X-Google-Smtp-Source: ABdhPJyfIduS+FKNaQ1z8iT76ouiL69VAr8Jg9sJfnimTmiLZ8YqOpyw6QrnBwbV6Yheio5LiOOvcw== X-Received: by 2002:a05:6402:8d7:: with SMTP id d23mr23562305edz.256.1616378801147; Sun, 21 Mar 2021 19:06:41 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc08960.dynamic.kabel-deutschland.de. [188.192.137.96]) by smtp.gmail.com with ESMTPSA id gt37sm8320425ejc.12.2021.03.21.19.06.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Mar 2021 19:06:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Mar 2021 03:06:32 +0100 Message-Id: <20210322020634.701593-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/kmvc: Prefer in-band palette X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes decoding of https://samples.ffmpeg.org/V-codecs/KMVC/LOGO2.AVI Signed-off-by: Andreas Rheinhardt --- libavcodec/kmvc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/kmvc.c b/libavcodec/kmvc.c index cd9e32f443..8d9f0a9693 100644 --- a/libavcodec/kmvc.c +++ b/libavcodec/kmvc.c @@ -275,6 +275,8 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame, if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; + frame->palette_has_changed = ff_copy_palette(ctx->pal, avpkt, avctx); + header = bytestream2_get_byte(&ctx->g); /* blocksize 127 is really palette change event */ @@ -303,9 +305,6 @@ static int decode_frame(AVCodecContext * avctx, void *data, int *got_frame, } } - if (ff_copy_palette(ctx->pal, avpkt, avctx)) - frame->palette_has_changed = 1; - if (ctx->setpal) { ctx->setpal = 0; frame->palette_has_changed = 1;