[Cin] Cinelerra-gg git + ffmpeg.git - still fails

[Andrew Randrianasulu]

..at patching stage:

root at slax:/dev/shm/tmp/cinelerra-goodguy-20190512/cinelerra-5.1/thirdparty# make
git clone https://git.ffmpeg.org/ffmpeg.git
Клонирование в «ffmpeg»…
remote: Counting objects: 566891, done.
remote: Compressing objects: 100% (121426/121426), done.
remote: Total 566891 (delta 453622), reused 555771 (delta 444308)
Получение объектов: 100% (566891/566891), 134.17 MiB | 1.78 MiB/s, готово.
Определение изменений: 100% (453622/453622), готово.
patch -d ffmpeg* -p1 < src/ffmpeg.git.patch1
patching file libavformat/bluray.c
patch -d ffmpeg* -p1 < src/ffmpeg.git.patch2
patching file libavformat/mpegtsenc.c
Hunk #1 FAILED at 56.
Hunk #6 FAILED at 719.
Hunk #7 succeeded at 742 (offset 8 lines).
Hunk #8 succeeded at 767 (offset 8 lines).
Hunk #9 succeeded at 776 (offset 8 lines).
Hunk #10 succeeded at 831 (offset 8 lines).
Hunk #11 succeeded at 918 (offset 8 lines).
Hunk #12 succeeded at 956 (offset 8 lines).
Hunk #13 succeeded at 1011 (offset 8 lines).
Hunk #14 succeeded at 1058 (offset 8 lines).
Hunk #15 succeeded at 1076 (offset 8 lines).
Hunk #16 succeeded at 1145 (offset 8 lines).
Hunk #17 succeeded at 1154 (offset 8 lines).
Hunk #18 succeeded at 1190 (offset 8 lines).
Hunk #19 succeeded at 1205 (offset 8 lines).
Hunk #20 succeeded at 1213 (offset 8 lines).
Hunk #21 succeeded at 1317 (offset 8 lines).
Hunk #22 succeeded at 1494 (offset 8 lines).
Hunk #23 succeeded at 1514 (offset 8 lines).
Hunk #24 succeeded at 1710 (offset 8 lines).
Hunk #25 succeeded at 1879 (offset 6 lines).
Hunk #26 succeeded at 1928 (offset 6 lines).
2 out of 26 hunks FAILED -- saving rejects to file libavformat/mpegtsenc.c.rej
-------------

reject is  just those lines:

--- libavformat/mpegtsenc.c     2018-04-20 04:02:57.000000000 -0600
+++ libavformat/mpegtsenc.c     2018-04-24 10:27:57.193689213 -0600
@@ -56,9 +56,8 @@
     int sid;           /* service ID */
     char *name;
     char *provider_name;
-    int pcr_pid;
-    int pcr_packet_count;
-    int pcr_packet_period;
+    int64_t pcr, pcr_packet_timer, pcr_packet_period;
+    int pcr_sid, pcr_pid;
     AVProgram *program;
 } MpegTSService;

@@ -719,6 +716,7 @@
     service->pmt.pid       = ts->pmt_start_pid + ts->nb_services;
     service->sid           = sid;
     service->pcr_pid       = 0x1fff;
+    service->pcr_sid       = 0x1fff;
     service->provider_name = av_strdup(provider_name);
     service->name          = av_strdup(name);
     if (!service->provider_name || !service->name)

but I don't understand  ffmpeg enough for reapplying them or even understand what they were doing! (probably blu-ray stuff?)

Note, i hacked thirdparty/Makefile so it git clones ffmpeg only, not other projects:

unpack_git=git clone https://git.ffmpeg.org/$(1)

instead of 
unpack_git=git clone $($(1)) $(1)