Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Marth64 <marth64@proxyid.net>
To: FFmpeg development discussions and patches
	<ffmpeg-devel@ffmpeg.org>, Marth64 <marth64@proxyid.net>
Subject: Re: [FFmpeg-devel] [PATCH] avformat/dvdvideodec: fix -pgc and -pg options
Date: Mon, 4 Mar 2024 10:37:55 -0600
Message-ID: <CA+28BfCgNiM4h-zpMv49J6VSLQdVsjKmarVSe_UesmLX=o+Jbw@mail.gmail.com> (raw)
In-Reply-To: <ZeWXyK387VtKBTMV@mariano>

Looks like v2 made it in. All good here. Thanks, Stefano !

On Mon, Mar 4, 2024 at 3:43 AM Stefano Sabatini <stefasab@gmail.com> wrote:

> 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 <marth64@proxyid.net>
> > > ---
> > >  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".

      reply	other threads:[~2024-03-04 16:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-03  2:29 Marth64
2024-03-04  9:24 ` Stefano Sabatini
2024-03-04  9:43   ` Stefano Sabatini
2024-03-04 16:37     ` Marth64 [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CA+28BfCgNiM4h-zpMv49J6VSLQdVsjKmarVSe_UesmLX=o+Jbw@mail.gmail.com' \
    --to=marth64@proxyid.net \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git