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 ESMTPS id CB6044CF8E for ; Thu, 13 Feb 2025 22:48:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DCA8268C15E; Fri, 14 Feb 2025 00:48:13 +0200 (EET) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 453DE68C14E for ; Fri, 14 Feb 2025 00:48:07 +0200 (EET) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-220c92c857aso22646985ad.0 for ; Thu, 13 Feb 2025 14:48:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739486884; x=1740091684; 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=5MNxuqSuTJ3DT4SKXYq30CBdmMhGu5bzSsGoahujKpY=; b=ZcVpQDYG8eyf1anFcWLadRtVt3q4WndjR2FE3iSEIkV9h7EuNJq2o8bWt5mVQ8/9LM 6CX4Qf+aMarYRWKLm5jmJEJl7zhjZArPiFXTS6lEOWzJwHoC5hylpf03qOP77hImxg/o oteNqPAp87J37ZUhFDryl1mBr9gvOdzaLn7dZOQvHM8SPGAUDFMLXEjlDglLirjRcawC ftBXKW8sziVjgiad5Mi5n4K6GgtSCjTzNofCXw1wLHkGdiXS2VfvixuLgeA4tTOBxvjC Qqw9/3hYecr59fmQW5w5f7iUSu7naE1fJ3H1oYZaYQVLslDGWGM/InYcM5YWh5BSalH9 jCUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739486884; x=1740091684; 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=5MNxuqSuTJ3DT4SKXYq30CBdmMhGu5bzSsGoahujKpY=; b=Xs+Tc0Z1MQAaKmLmJrof+s4GnlNLyaVwZZ5nKYWU/cFpp1oWYmXAODu1MafxZc2dx1 4CPeVTUCXVhvsfcijvqv1z0dTLG0Hi4c3g3Xn8ixBXsn2utQW7rfoF8dXxWidSK9TFRE d8Mr+0m5DIJGfn5hGwvheSWpPxsqhENknUgB7wkhQyLHM2bEg6FqdFy47D/tYG8Y0NuQ OQlUtPWNyZNxE0XP9llKW5QY5NK9uBM3xbgiPZ4fXWHvP4v2r7Z9txbuMsEJJp1RaRpI L1H+pav8t0g0bgl8lV8PFTaXxiju+SurGkij1cTOyGrQBMQZDOfbAlKDfE2Px8KzxwHv gV7w== X-Gm-Message-State: AOJu0YwmqW1M35sy1dpnehWtKneuegWLePP23V6zbLabLOY4phHCP0yR k+nsijA9EpcOs2IiHUQeI2sxdctdxLZq8syE+24wE+Tvp01u1JM9B5kFZOzS X-Gm-Gg: ASbGnctoOLsAswAeKYKI0a4+gOg8dTKLaqEmZo/TTQMqS2xnroBYkL0ZyJAu6s+5ARg km6cRFSucwTebEf3MXo/haEO6DpHoOXJkaf83NXYByB6+C9hGsARhy8W9R9l+E1Fvr94o0WQt2z kfLd03OnGCwuCFUBwlg2lRcuQo9ivtqQDC0PCat836MyvyPFAenFmNv7Y2IBuw41e1Br/Id2wXK 3yY+sdWKXdHtMLqyy7fy2psXwika1a0MsUbbhTx9zLNAq3fwvyQrHrNNfbFXIsp6KVoGm/6pznK nhMPcYRohHpKp9gDp8elYtjZ/+JnXUE= X-Google-Smtp-Source: AGHT+IE+iAushEjgGRnVOl6L035PZSh31g1xJU4Bhr+IBQEn4VMDMo9b2RNxakchTKnuRW+Xp8FXLg== X-Received: by 2002:a17:903:287:b0:215:742e:5cff with SMTP id d9443c01a7336-220d3724461mr85352005ad.16.1739486884313; Thu, 13 Feb 2025 14:48:04 -0800 (PST) Received: from localhost.localdomain ([2800:2121:b040:c:1596:bee8:ed07:ae97]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d556d6a1sm17165125ad.179.2025.02.13.14.48.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2025 14:48:03 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Feb 2025 19:47:45 -0300 Message-ID: <20250213224746.769-1-jamrial@gmail.com> X-Mailer: git-send-email 2.48.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/oggenc: don't discard empty packets with no side data 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: Theora signals "Output last frame again" with an empty packet. To keep the behaviour of 18f24527eb of ignoring side data only packets, as generated by the FLAC encoder to propagate updated extradata, also check for pkt->side_data_size to choose wheter to mux the paket or not. Fixes part of ticket #11451. Signed-off-by: James Almer --- libavformat/oggenc.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c index 224519a4da..0647111396 100644 --- a/libavformat/oggenc.c +++ b/libavformat/oggenc.c @@ -241,7 +241,8 @@ static int ogg_buffer_data(AVFormatContext *s, AVStream *st, len = FFMIN(size, segments*255); page->segments[page->segments_count++] = len - (segments-1)*255; - memcpy(page->data+page->size, p, len); + if (len) + memcpy(page->data+page->size, p, len); p += len; size -= len; i += segments; @@ -690,7 +691,7 @@ static int ogg_write_packet(AVFormatContext *s, AVPacket *pkt) int i; if (pkt) - return pkt->size ? ogg_write_packet_internal(s, pkt) : 0; + return pkt->size || !pkt->side_data_elems ? ogg_write_packet_internal(s, pkt) : 0; for (i = 0; i < s->nb_streams; i++) { OGGStreamContext *oggstream = s->streams[i]->priv_data; @@ -710,7 +711,7 @@ static int ogg_write_trailer(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { OGGStreamContext *oggstream = s->streams[i]->priv_data; - if (oggstream->page.size > 0) + if (oggstream->page.segments_count) ogg_buffer_page(s, oggstream); } -- 2.48.1 _______________________________________________ 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".