From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 9A7694FBA8 for ; Sat, 28 Jun 2025 14:28:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 133D668E33D; Sat, 28 Jun 2025 17:28:25 +0300 (EEST) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id A242B68DF32 for ; Sat, 28 Jun 2025 17:28:23 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-450cf214200so5802875e9.1 for ; Sat, 28 Jun 2025 07:28:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751120903; x=1751725703; darn=ffmpeg.org; h=mime-version:references:in-reply-to:message-id:date:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=2WfDZ1YIseWBAdzTbOl5QwggldGj+vanREtDQrULdlI=; b=X06ShjD8AQZbNoBLgCVguLJXm5OpU3QKJ64901w7D5U1NPpCGcq4KHaJZ+inPIQk/K VggxQa3fe/kwDLICYDezQ7iqrAkVmidQan8fVstbA+VTBjOgYyTffQMKu5j1g4vH7/zt ul2dDl2HraJB4TRzyRNt7NMAirAt+Nd9pW+744W5npPvDu6XQXioPcC3X1h24x6x1Iqs s+UY5v0kvx9z+MxWsH8hillF+qDplue6Q1ObQcWsHNq4HlxA4qA/yw9W/LUZyQURdo2K Fxb6/1vLm51n2V6WZLs0Le3Lp4rn5b0Xaba7t/DMiQ753fAhMRBMn3i1SdJdAjEkVwl0 MlIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751120903; x=1751725703; h=mime-version:references:in-reply-to:message-id:date:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=2WfDZ1YIseWBAdzTbOl5QwggldGj+vanREtDQrULdlI=; b=EqPF99ns1H3YuU3li6yJMbuV4dcVNYGyqcApetvyY45ySjWhASYBV8s+K/n/5xLCFo HfbkO8/ruV577sjNnvA7a91JFFEtA4b4HTQrS9NO1KPnfscELFns0y4rozfOy2QLIv2B k4gXT4frcjdDVUMKlSQTqg1w9WLJIUatEXrO10phfrXEwfypEVxHgXYXBtN3jv1cr39F VFmwRIpRJ8b2JUfl+135JTOTiMOfkwOVE7xYpxEvksPWYB6fbkx/PbsbOOlgwR7RtpFD sm0N7s4xyVjwpZarM8cGCfBIt+5J6/cRgmxv64DO31ffHszU84yeQY5+Z+cM1/a6yztv vpCg== X-Gm-Message-State: AOJu0Yy1+vCQrlbLaH/6jAIGzaLkj0jkQuW4MOQsH8J1QGGrIYa5cFs1 6GRoAgFD7cln+N5+U07hinL5/ZV5CEIyWqqU1oPfwb6IizUR2EDk1grUgrUbdw== X-Gm-Gg: ASbGncs4hgtJQMPqncWcnbmRBitRqoeX6K+LzNUDue0FOVFwmq3VR2tkz1mYUhTGXY+ Rpk9hSBTuH5Hi5ZGndaZtW1nRog+rqTP+tG6tQcgqtzXlkZucndYzvpYnkpuhFRqXK0sv9Y3ozX ZKq32u99HFQCfaUdO1h9B5/Txq1kQlfBSEFJ8R1Au9yDxgkqI/gBMtdnB/J4nkWumCZZ0YLPxQT l/M8XHWhdC3LxAt8ZqhYhX5TdQtdomvui9L7qQVdNTIAnHCIjMPk5869pnQv8hbeK+EwklO2Vwj geWUWiyG+oEJBWS0JewiV+8A8AT/Fy5cdJOETLW64Eh/FQBV3y9uJZQ/hl3VNeJeH7XhSjoH2M8 QoZM0gVmsiTetoQVXU0OG7M86m4BibmGqVlTNnhxXkMBj9/DEBjf1BulV8rwdlKU+iAnbNvrluT E= X-Google-Smtp-Source: AGHT+IFWFOpkN/uzJCwsNiCibopDHNTXWPMsv256NsithuXzQHmaFFAx01JJJ1Vak2cQL+SfWdFKBg== X-Received: by 2002:a05:600c:4706:b0:453:8bc7:5e53 with SMTP id 5b1f17b1804b1-4538edf9e08mr84304345e9.0.1751120902648; Sat, 28 Jun 2025 07:28:22 -0700 (PDT) Received: from [192.168.178.57] (p2003010237004500d82e3c7de7372df5.dip0.t-ipconnect.de. [2003:102:3700:4500:d82e:3c7d:e737:2df5]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4538a43325asm80125385e9.16.2025.06.28.07.28.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Jun 2025 07:28:22 -0700 (PDT) From: Marvin Scholz To: FFmpeg development discussions and patches Date: Sat, 28 Jun 2025 16:28:21 +0200 X-Mailer: MailMate (2.0r6222) Message-ID: <8ED3A1CC-166E-4C0E-8A41-60A1150592EF@gmail.com> In-Reply-To: <20250627215048.GK29660@pb2> References: <20250624180202.15430-1-epirat07@gmail.com> <20250624180202.15430-2-epirat07@gmail.com> <20250627215048.GK29660@pb2> MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 2/3] lavf: add and use AVRTCPSenderReport struct 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: On 27 Jun 2025, at 23:50, Michael Niedermayer wrote: > On Tue, Jun 24, 2025 at 08:02:01PM +0200, Marvin Scholz wrote: >> This will be used in a future commit to expose the SR as side-data. >> --- >> libavcodec/defs.h | 14 ++++++++++++++ >> libavformat/rtpdec.c | 34 ++++++++++++++++++++-------------- >> libavformat/rtpdec.h | 4 ++-- >> libavformat/rtspdec.c | 2 +- >> 4 files changed, 37 insertions(+), 17 deletions(-) > > this seems not to apply > Indeed, sent a new version rebased on recent master. > git am -3 > Applying: lavf: add and use AVRTCPSenderReport struct > error: sha1 information is lacking or useless (libavformat/rtpdec.c). > error: could not build fake ancestor > Patch failed at 0001 lavf: add and use AVRTCPSenderReport struct > hint: Use 'git am --show-current-patch=diff' to see the failed patch > hint: When you have resolved this problem, run "git am --continue". > hint: If you prefer to skip this patch, run "git am --skip" instead. > hint: To restore the original branch and stop patching, run "git am --abort". > hint: Disable this message with "git config set advice.mergeConflict false" > > > git am --show-current-patch=diff | patch -p1 --dry-run -F9 > checking file libavcodec/defs.h > checking file libavformat/rtpdec.c > Hunk #4 FAILED at 602. > Hunk #5 FAILED at 622. > 2 out of 5 hunks FAILED > checking file libavformat/rtpdec.h > checking file libavformat/rtspdec.c > > > [...] > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Many things microsoft did are stupid, but not doing something just because > microsoft did it is even more stupid. If everything ms did were stupid they > would be bankrupt already. > _______________________________________________ > 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". _______________________________________________ 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".