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 BAE2349B8C for ; Mon, 4 Mar 2024 09:43:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0CD2168D430; Mon, 4 Mar 2024 11:43:46 +0200 (EET) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BC7568D026 for ; Mon, 4 Mar 2024 11:43:39 +0200 (EET) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5656e5754ccso5429966a12.0 for ; Mon, 04 Mar 2024 01:43:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709545418; x=1710150218; darn=ffmpeg.org; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:from:to:cc:subject :date:message-id:reply-to; bh=zzqNmpdNzMZcLFfUHWjLkAgUANTt5KLRoahT0W6VDsA=; b=SsT+bNU9z1zM41vg/a+pESYfA08rOthLcWb6QfAWpqzUfxitYUA75I3IH5rFYjaVwJ quf7yYWFGt0OZrrluOIWvR9TA1TBoZ7S1B2mbfT3mTO3UXMl2DypJCBLSFiQtNoTCnZz Mhz2yW41AliF3oGfWkPvgktNDALu6RTHnRdxjl7tVeYdj57D/5oAmDbXZnYDKmEGXaOG TIMiUAC8vyGH9EPeUxk5cCbtm6veCA76yhe8VXfLjIDTZCk4BC9HQSIMZCvIVWgNmK7y QtlXFEAyez/y0KkLXBaJqi2HgZB+oEQWbKbH7ee2eHTK475CfZ02OOKYxyHMyBcJ5mDs Thig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709545418; x=1710150218; h=user-agent:in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:to:from:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=zzqNmpdNzMZcLFfUHWjLkAgUANTt5KLRoahT0W6VDsA=; b=WxvIMksoRUoKzZ/hy18jp0yHyXh4RMN/UaDxBjF1bXuVurAaL2b/sEqJ+6YI/0WhhN bNhkl9qa2BQX1z9ktABnTEgtcD1LwDFf3U8/I0XwIL5cjrKW+BCRTEob3ORrueDvk7mY OBV/beWKheZTBtsETtdRh0rzQQmmGQh+MrtIxa9/noclzXBXIGaaBcvGIf+LyKZiV3Jt i0vDcfm/9az235ZNGExTJ/wWyszGQ/gAFJ2b1Pocm4ZDQZeKRPxzn9VBo2kL/qc5cAKM Hw70YejlZ4vpQ5CbWMarM5+6HqV7dzOU/FDcfmoGUeRsSmk0ovQQUeBFO2Ywt9ImQGGA OHug== X-Gm-Message-State: AOJu0YyWIQQ7d07NvfHwyWvEQhK3qzshu0QO6G5dGfBS4L1hpxojfPF0 DVUXZ4wknsNRlQLorbIOj9ryo1CKlA37zPvuZOyQfj5wdfJRs/Quj9lGo3bT X-Google-Smtp-Source: AGHT+IHZu0CiyTVqtgLWZ4gH/v8dBfTu1czWc/BNjvn1KH7lPvKAeY/jt+seaLtCmhb99ZBYL2t7Uw== X-Received: by 2002:a17:906:2516:b0:a3e:39f7:52b4 with SMTP id i22-20020a170906251600b00a3e39f752b4mr6241342ejb.49.1709545417631; Mon, 04 Mar 2024 01:43:37 -0800 (PST) Received: from mariano ([188.210.239.74]) by smtp.gmail.com with ESMTPSA id d14-20020a170906040e00b00a4138c3f065sm4557541eja.56.2024.03.04.01.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 01:43:37 -0800 (PST) Received: by mariano (Postfix, from userid 1000) id 33C5EBFCDC; Mon, 4 Mar 2024 10:43:36 +0100 (CET) Date: Mon, 4 Mar 2024 10:43:36 +0100 From: Stefano Sabatini To: FFmpeg development discussions and patches , Marth64 Message-ID: Mail-Followup-To: FFmpeg development discussions and patches , Marth64 References: <20240303022912.2105313-1-marth64@proxyid.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.1.4 (2021-12-11) Subject: Re: [FFmpeg-devel] [PATCH] avformat/dvdvideodec: fix -pgc and -pg options 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 date Monday 2024-03-04 10:24:42 +0100, Stefano Sabatini wrote: > On date Saturday 2024-03-02 20:29:13 -0600, Marth64 wrote: > > In merged DVD patch, -pgc and -pg options were broken. While these are > > rather advanced options, they are the only means to get content for > > some strangely authored discs. > > > > Signed-off-by: Marth64 > > --- > > libavformat/dvdvideodec.c | 23 +++++++++++++---------- > > 1 file changed, 13 insertions(+), 10 deletions(-) > > Will apply, thanks. Not really: $ git am patches/0001-lavf-dvvideodec-fix-opts.patch --reject Applying: avformat/dvdvideodec: fix -pgc and -pg options Checking patch libavformat/dvdvideodec.c... Hunk #1 succeeded at 507 (offset -1 lines). Hunk #2 succeeded at 1255 (offset -12 lines). error: while searching for: (ret = dvdvideo_subp_stream_add_all(s)) < 0) return ret; if (!c->opt_preindex) return dvdvideo_chapters_setup_simple(s); return ret; error: patch failed: libavformat/dvdvideodec.c:1288 Applying patch libavformat/dvdvideodec.c with 1 reject... Hunk #1 applied cleanly. Hunk #2 applied cleanly. Rejected hunk #3. _______________________________________________ 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".