From patchwork Mon Apr 8 16:49:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 47935 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3f98:b0:1a7:a0dc:8de5 with SMTP id ay24csp29474pzb; Mon, 8 Apr 2024 09:49:11 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV8BjMQqPIdUchmLQrrct/al1V6PAZ7c0u8JFwlJkjBdf6Poe1JzISHbK4BWapXKTxxGj0D49iuwOYwboH6Nf8i4a5rWY6JOdxoAw== X-Google-Smtp-Source: AGHT+IGOJn0+eosz1oJNNzSpPX/a3meejOpOgrV91HpT6OtUKAdL2VnCZPCFqRsGIen3UHh3d96f X-Received: by 2002:a17:907:7ba2:b0:a51:b0e1:8640 with SMTP id ne34-20020a1709077ba200b00a51b0e18640mr7694133ejc.9.1712594951521; Mon, 08 Apr 2024 09:49:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712594951; cv=none; d=google.com; s=arc-20160816; b=bCF+xXUz9iPh2dv9/7Q0mPV226WiQtoTnh2TRvhnEKJk0EqhM1kFfhsqG1CIPSJMaH RdSry8KQHMG1M/n5LdCy5C/mCYJGfrq1wK6yq5Whn8LSqj4AHLDMq/7Wmtd6TYPtVVPy lSy+TKri4rt1ig5zOk413FDWEI2I7gnbWyBzNRZ7Y6nAgVNfvvXwKLM33WW2ypTve3F/ A5ybE70zCiVkBbU9Mg875FOEadqqInhr41q1Yy0aWbV9LmHiezmZ2OXRoxVFHHKZTshw vNFu2veOZSI6vYW3VXj7SBCiy62sWMqDVQ9AWdukWxhjD4N5Bw4klvC5j2rckWojn7l7 P9Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=WzLNy15NVBu8xCTFTRrzHsgy5zNHi+sZIkYj0rxBd94=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=JQe6EPAa9cnYxPFrTiz9AzNeRPKpRYI6HzAR73Em+C8J8J0WAkCP0J/jhxj2x41AAV r14+z99d/xkXKG1wC8asRnUuPIfPkbW4JJeMa+dIsOWNvQ92fKxR3+0XeS7cRqcv8tZW FCckWDHh0BWleHqo+3tIgCtzKsb6WbXqymJoQijawNFfc/QBH1jrjsb/3AZJWvpJ43aT s3Cr2Y/bGuV2/wDfOgyVWOOf2mn3dER85yw8Xv1htMJAhjnlZw9TRovbyX//Tt19eiRL lKaPtRvbo99aN788gQAtPnVXaLdZ9rq1i4GfRq0MhkhzUfvX1SiJaY8hKu5D5jcLcUPK R4Jw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=FkBwlODU; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l20-20020a170906795400b00a51c1e0176fsi2407273ejo.823.2024.04.08.09.49.11; Mon, 08 Apr 2024 09:49:11 -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=@niedermayer.cc header.s=gm1 header.b=FkBwlODU; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B5E1668D28A; Mon, 8 Apr 2024 19:49:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF13F68D0F4 for ; Mon, 8 Apr 2024 19:49:01 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0C3141BF204 for ; Mon, 8 Apr 2024 16:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1712594941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=jDsds6gEJQvdnRtkhfH5NEgCejrF+x8NSC9W9gTYYvE=; b=FkBwlODU4MwGfYxgXLvHvxRjeP7taAXZX7rv6VqedLl84loz4XBIOFrwuZlluKm+Brha9K sRA8nOQqnISnvojn9g0KPPPkHksSeK2GcjXH1FE9r0fSglimAck5lhraHh0FX/RqGmF15g Iticp68andjVK/2b9IDlTR1ZoCvVVPMZrrSe9vbRUys6l1kl6rwCUQnUO7ymgShnEJtCdX NzEo8YigfLzfU2d76mNXk6aJxdvH1AgYKEJAQzNKvyJi1fUDe/zSSHE9IdXoCqyEaPlfVg VgNDS9osNZsj/9s4P80DYIz6GZRNklLDdHt0X3bbrxL+r1fYQMaYVeP3xhPMDQ== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 8 Apr 2024 18:49:00 +0200 Message-Id: <20240408164900.7685-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avcodec/mpegvideo_enc: Fix 1 line and one column images 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fZSZFZ+5e5bd Fixes: Ticket10952 Fixes: poc21ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo_enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index d1b19178247..40844b2f682 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1199,8 +1199,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg) ptrdiff_t dst_stride = i ? s->uvlinesize : s->linesize; int h_shift = i ? s->chroma_x_shift : 0; int v_shift = i ? s->chroma_y_shift : 0; - int w = s->width >> h_shift; - int h = s->height >> v_shift; + int w = -((-s->width) >> h_shift); + int h = -((-s->height) >> v_shift); const uint8_t *src = pic_arg->data[i]; uint8_t *dst = pic->f->data[i]; int vpad = 16;