[FFmpeg-devel] [PATCH] avformat/dvdvideodec: fix -pgc and -pg options

[Marth64]

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

On Mon, Mar 4, 2024 at 3:43 AM Stefano Sabatini <stefasab at 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 at 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.
>