From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 399D148810 for ; Thu, 18 Jul 2024 01:59:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 52EAE68D94B; Thu, 18 Jul 2024 04:59:03 +0300 (EEST) Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 993A568D957 for ; Thu, 18 Jul 2024 04:58:56 +0300 (EEST) Received: by mail-ot1-f41.google.com with SMTP id 46e09a7af769-70364e06dc6so183360a34.0 for ; Wed, 17 Jul 2024 18:58:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721267935; x=1721872735; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=hGKfpLzMxiRwe9iiPkeIXDSM9UgeaVS+etni1ugIacs=; b=HqGMcg+22pZY3dZiae7OCGhlJnffNVUSuDj8KVQJN2R2M+K514XbG6+z3BF12vYVaT EvzqmE/ews/oV21gGrs8T0m7w+ZGZugJVqpRt2IjxEzlbHGLddOc1e5pmdaV5aqc4qE3 3b2aPjsD1yLipGm+GXHxrq6WIX9M3TA0xm1E4xcr7sIwJ87opbKMbuQUYNAA9TODz57x /zBkAHmhw5GM/cHL7nEGsWhIVW4shPqcgZEt0nKYa49RdBlRjmRHlPMwVO4mPaTp7lJZ APkIlJwKq81ei2BIodZKdJlfP2CwNDrYnXH5xVdedR7km77KE01GXxb38QaaM2dKXrbn BjuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721267935; x=1721872735; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hGKfpLzMxiRwe9iiPkeIXDSM9UgeaVS+etni1ugIacs=; b=N1CbrsoQ9HPYXJn2AJRa08GL9sPn9obqbdbvsGN4mLMlHO0Kl72m4fnYvwo4P3z+nG FQD+OhLpnmy4ptsU6Y3r3u6FIdmhUJ9LHum14Nrc7mxJ+dR3WFmeIKSRz0ePMM8VP8Tl SBz9tZ4JIhep0U1SlOgJKHz+YkBhu3f7G6TNSePIKk1ZmgPDeiOULO0H/4azqak4CrR5 5ogSGnrhOHrpi7IvwTiw+mx6hP42tfZea2TYmE8a9R66izzJvKJHWeVKoq/AwLOTemOd /yZu0NmXjfGWHPy3jscswt2FjF0YMzokrDHRRlpCCfRV9kdhLP7IQi0x6CVEZffpE2Tn Fhhw== X-Gm-Message-State: AOJu0Yw5Byv/o3EMb9AWz3lQ29ebeObVkCYKEkU5qZVpZlIpD4QiKdBf HRA8VPC1l2kHzxrmOc2cnNJSaDeb3gWXJhCPV04ilG8iaPzHsBqpLSgl6w== X-Google-Smtp-Source: AGHT+IEu8+/N/00XkYlk4A5lqNeJtYrTGaF/WYI0JrS4SqgHLFzuWdXHEsuruVOsUS7+/QGeRV3rFQ== X-Received: by 2002:a05:6830:4703:b0:700:d506:cfe9 with SMTP id 46e09a7af769-708e37e0992mr5006499a34.19.1721267934476; Wed, 17 Jul 2024 18:58:54 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b7ebb6aa1sm8836559b3a.77.2024.07.17.18.58.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jul 2024 18:58:53 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Jul 2024 22:58:55 -0300 Message-ID: <20240718015856.5276-1-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: don't export frame cropping stream side data when the clap box is a no-op 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavformat/mov.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index ce95842ce5..20efc74f00 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1262,6 +1262,9 @@ static int mov_read_clap(MOVContext *c, AVIOContext *pb, MOVAtom atom) bottom = st->codecpar->height - 1 - bottom; right = st->codecpar->width - 1 - right; + if (!(left | right | top | bottom)) + return 0; + if ((left + right) >= st->codecpar->width || (top + bottom) >= st->codecpar->height) return AVERROR_INVALIDDATA; -- 2.45.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".