[Cin] ffmpeg.git.patch4 is not needed anymore?

[Phyllis Smith]

Andrew,
Thanks for the notice of ffmpeg patch4 no longer needed.  GG will be very
glad to get rid of this and will try to check it today yet.

On Wed, Aug 26, 2020 at 2:11 PM Andrew Randrianasulu via Cin <
cin at lists.cinelerra-gg.org> wrote:

> Hello, all!
>
> for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4
> is not applicable anymore, and ffmpeg log list this commit:
>
>
> https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a7bd37927628df3672488e07f718b3549bea717d
>
> avfilter/af_aformat: Add uninit function
>
> so, i just moved this patch away from buildsystem for now.
>
> sadly, bigger patch ffmpeg.git.patch2 (mpegts/blu-ray) also started to
> show at least one failure:
>
> (as of ffmpeg commit 649a6969f75f2378c65768deb9debd325eb2fc7f):
>
> root at slax:/dev/shm/tmp/cinelerra-goodguy-20200826/cinelerra-5.1/thirdparty/ffmpeg.git#
> cat ../src/_ffmpeg.git.patch2 | patch -p1
> patching file libavformat/mpegtsenc.c
> Hunk #1 succeeded at 57 (offset 1 line).
> Hunk #2 succeeded at 78 (offset 1 line).
> Hunk #3 succeeded at 93 (offset 1 line).
> Hunk #4 succeeded at 109 (offset 1 line).
> Hunk #5 succeeded at 218 (offset 1 line).
> Hunk #6 succeeded at 238 (offset 1 line).
> Hunk #7 succeeded at 260 (offset 3 lines).
> Hunk #8 succeeded at 282 (offset 3 lines).
> Hunk #9 succeeded at 295 (offset 3 lines).
> Hunk #10 succeeded at 324 (offset 4 lines).
> Hunk #11 succeeded at 676 (offset 28 lines).
> Hunk #12 succeeded at 702 (offset 28 lines).
> Hunk #13 succeeded at 742 (offset 28 lines).
> Hunk #14 succeeded at 755 (offset 28 lines).
> Hunk #15 succeeded at 814 (offset 28 lines).
> Hunk #16 succeeded at 876 (offset 28 lines).
> Hunk #17 succeeded at 1077 (offset 28 lines).
> Hunk #18 succeeded at 1086 (offset 28 lines).
> Hunk #19 succeeded at 1104 (offset 28 lines).
> Hunk #20 succeeded at 1173 (offset 28 lines).
> Hunk #21 succeeded at 1233 (offset 28 lines).
> Hunk #22 succeeded at 1241 (offset 28 lines).
> Hunk #23 succeeded at 1315 (offset 28 lines).
> Hunk #24 succeeded at 1345 (offset 28 lines).
> Hunk #25 succeeded at 1363 (offset 28 lines).
> Hunk #26 succeeded at 1424 (offset 28 lines).
> Hunk #27 succeeded at 1522 (offset 28 lines).
> Hunk #28 succeeded at 1534 (offset 28 lines).
> Hunk #29 FAILED at 1585.
> Hunk #30 succeeded at 1644 (offset 28 lines).
> Hunk #31 succeeded at 1789 with fuzz 1 (offset 85 lines).
> Hunk #32 succeeded at 1843 (offset 85 lines).
> Hunk #33 succeeded at 1857 (offset 85 lines).
> Hunk #34 succeeded at 1925 (offset 86 lines).
> 1 out of 34 hunks FAILED -- saving rejects to file
> libavformat/mpegtsenc.c.rej
>
> cat libavformat/mpegtsenc.c.rej
> --- libavformat/mpegtsenc.c
> +++ libavformat/mpegtsenc.c
> @@ -1585,7 +1446,7 @@ static int
> mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
>
>              ret = avio_open_dyn_buf(&ts_st->amux->pb);
>              if (ret < 0)
> -                return ret;
> +                return AVERROR(ENOMEM);
>
>              ret = av_write_frame(ts_st->amux, &pkt2);
>              if (ret < 0) {
>
> I tried to make new patch (by manually adding missed chunk), but not
> tested it yet (attached)
> --
> Cin mailing list
> Cin at lists.cinelerra-gg.org
> https://lists.cinelerra-gg.org/mailman/listinfo/cin
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.cinelerra-gg.org/pipermail/cin/attachments/20200827/d77c29a8/attachment.htm>