<div dir="ltr"><div class="gmail_default" style="font-size:small">Andrew,</div><div class="gmail_default" style="font-size:small">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.<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Aug 26, 2020 at 2:11 PM Andrew Randrianasulu via Cin <<a href="mailto:cin@lists.cinelerra-gg.org">cin@lists.cinelerra-gg.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hello, all!<br>
<br>
for my usual rebuild of CinGG with ffmpeg.git I found ffmpeg.git.patch4<br>
is not applicable anymore, and ffmpeg log list this commit:<br>
<br>
<a href="https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a7bd37927628df3672488e07f718b3549bea717d" rel="noreferrer" target="_blank">https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/a7bd37927628df3672488e07f718b3549bea717d</a><br>
<br>
avfilter/af_aformat: Add uninit function<br>
<br>
so, i just moved this patch away from buildsystem for now.<br>
<br>
sadly, bigger patch ffmpeg.git.patch2 (mpegts/blu-ray) also started to show at least one failure:<br>
<br>
(as of ffmpeg commit 649a6969f75f2378c65768deb9debd325eb2fc7f):<br>
<br>
root@slax:/dev/shm/tmp/cinelerra-goodguy-20200826/cinelerra-5.1/thirdparty/ffmpeg.git# cat ../src/_ffmpeg.git.patch2 | patch -p1<br>
patching file libavformat/mpegtsenc.c<br>
Hunk #1 succeeded at 57 (offset 1 line).<br>
Hunk #2 succeeded at 78 (offset 1 line).<br>
Hunk #3 succeeded at 93 (offset 1 line).<br>
Hunk #4 succeeded at 109 (offset 1 line).<br>
Hunk #5 succeeded at 218 (offset 1 line).<br>
Hunk #6 succeeded at 238 (offset 1 line).<br>
Hunk #7 succeeded at 260 (offset 3 lines).<br>
Hunk #8 succeeded at 282 (offset 3 lines).<br>
Hunk #9 succeeded at 295 (offset 3 lines).<br>
Hunk #10 succeeded at 324 (offset 4 lines).<br>
Hunk #11 succeeded at 676 (offset 28 lines).<br>
Hunk #12 succeeded at 702 (offset 28 lines).<br>
Hunk #13 succeeded at 742 (offset 28 lines).<br>
Hunk #14 succeeded at 755 (offset 28 lines).<br>
Hunk #15 succeeded at 814 (offset 28 lines).<br>
Hunk #16 succeeded at 876 (offset 28 lines).<br>
Hunk #17 succeeded at 1077 (offset 28 lines).<br>
Hunk #18 succeeded at 1086 (offset 28 lines).<br>
Hunk #19 succeeded at 1104 (offset 28 lines).<br>
Hunk #20 succeeded at 1173 (offset 28 lines).<br>
Hunk #21 succeeded at 1233 (offset 28 lines).<br>
Hunk #22 succeeded at 1241 (offset 28 lines).<br>
Hunk #23 succeeded at 1315 (offset 28 lines).<br>
Hunk #24 succeeded at 1345 (offset 28 lines).<br>
Hunk #25 succeeded at 1363 (offset 28 lines).<br>
Hunk #26 succeeded at 1424 (offset 28 lines).<br>
Hunk #27 succeeded at 1522 (offset 28 lines).<br>
Hunk #28 succeeded at 1534 (offset 28 lines).<br>
Hunk #29 FAILED at 1585.<br>
Hunk #30 succeeded at 1644 (offset 28 lines).<br>
Hunk #31 succeeded at 1789 with fuzz 1 (offset 85 lines).<br>
Hunk #32 succeeded at 1843 (offset 85 lines).<br>
Hunk #33 succeeded at 1857 (offset 85 lines).<br>
Hunk #34 succeeded at 1925 (offset 86 lines).<br>
1 out of 34 hunks FAILED -- saving rejects to file libavformat/mpegtsenc.c.rej<br>
<br>
cat libavformat/mpegtsenc.c.rej<br>
--- libavformat/mpegtsenc.c<br>
+++ libavformat/mpegtsenc.c<br>
@@ -1585,7 +1446,7 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)<br>
<br>
ret = avio_open_dyn_buf(&ts_st->amux->pb);<br>
if (ret < 0)<br>
- return ret;<br>
+ return AVERROR(ENOMEM);<br>
<br>
ret = av_write_frame(ts_st->amux, &pkt2);<br>
if (ret < 0) {<br>
<br>
I tried to make new patch (by manually adding missed chunk), but not tested it yet (attached)<br>
-- <br>
Cin mailing list<br>
<a href="mailto:Cin@lists.cinelerra-gg.org" target="_blank">Cin@lists.cinelerra-gg.org</a><br>
<a href="https://lists.cinelerra-gg.org/mailman/listinfo/cin" rel="noreferrer" target="_blank">https://lists.cinelerra-gg.org/mailman/listinfo/cin</a><br>
</blockquote></div>