<div dir="ltr"><div class="gmail_default" style="font-size:small">After reviewing, GG says he had waited a couple of months before merging the mods so he is bummed that they are modifying those things again. He plans on backing out their mods and waiting until they quit changing them again. At that time, he will try once again to get them in. Thanks so much for the early warning.<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Oct 29, 2020 at 10:42 AM 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"><a href="https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/cea7c19cda0ea1630ae1de8c102ab14231b9db10" rel="noreferrer" target="_blank">https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/cea7c19cda0ea1630ae1de8c102ab14231b9db10</a><br>
<br>
=====<br>
lavf: move AVStream.*index_entries* to AVStreamInternal<br>
<br>
Those are private fields, no reason to have them exposed in a public<br>
header. Since there are some (semi-)public fields located after these,<br>
even though this section is supposed to be private, keep some dummy<br>
padding there until the next major bump to preserve ABI compatibility.<br>
======<br>
<br>
so, now CinGG fails to build:<br>
<br>
ffmpeg.C:723:11: error: no member named 'nb_index_entries' in 'AVStream'<br>
if( st->nb_index_entries > 0 ) tstmp = st->index_entries[0].timestamp;<br>
~~ ^<br>
ffmpeg.C:723:46: error: no member named 'index_entries' in 'AVStream'<br>
if( st->nb_index_entries > 0 ) tstmp = st->index_entries[0].timestamp;<br>
~~ ^<br>
8 warnings generated.<br>
clang++ `cat i686/c_flags` -DMSGQUAL=filebase -c filebase.C -o i686/filebase.o<br>
In file included from filebaseaudio.C:24:<br>
In file included from ./file.h:37:<br>
In file included from ./formattools.h:26:<br>
In file included from /dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/guicast.h:35:<br>
/dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bcpan.h:96:6: warning: 'BC_Pan::activate' hides overloaded virtual function [-Woverloaded-virtual]<br>
int activate(int popup_x = -1, int popup_y = -1);<br>
^<br>
/dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bcwindowbase.h:375:14: note: hidden overloaded virtual function 'BC_WindowBase::activate' declared here: different number of parameters (0 vs 2)<br>
virtual int activate();<br>
^<br>
In file included from filebaseaudio.C:24:<br>
In file included from ./file.h:37:<br>
In file included from ./formattools.h:26:<br>
In file included from /dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/guicast.h:36:<br>
In file included from /dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bcfilebox.h:33:<br>
In file included from /dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bctextbox.h:25:<br>
/dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bclistbox.h:190:6: warning: 'BC_ListBox::activate' hides overloaded virtual function [-Woverloaded-virtual]<br>
int activate(int take_focus = 1);<br>
^<br>
/dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bcwindowbase.h:375:14: note: hidden overloaded virtual function 'BC_WindowBase::activate' declared here: different number of parameters (0 vs 1)<br>
virtual int activate();<br>
^<br>
In file included from filebaseaudio.C:24:<br>
In file included from ./file.h:37:<br>
In file included from ./formattools.h:26:<br>
In file included from /dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/guicast.h:36:<br>
In file included from /dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bcfilebox.h:33:<br>
In file included from /dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bctextbox.h:25:<br>
/dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bclistbox.h:191:6: warning: 'BC_ListBox::activate' hides overloaded virtual function [-Woverloaded-virtual]<br>
int activate(int x, int y, int w=-1, int h=-1);<br>
^<br>
/dev/shm/tmp/cinelerra-goodguy-20201029/cinelerra-5.1/cinelerra/../guicast/bcwindowbase.h:375:14: note: hidden overloaded virtual function 'BC_WindowBase::activate' declared here: different number of parameters (0 vs 4)<br>
virtual int activate();<br>
^<br>
ffmpeg.C:3922:5: warning: absolute value function 'abs' given an argument of type 'long long' but has parameter of type 'int' which may cause truncation of value [-Wabsolute-value]<br>
if( abs(pos-aud->curr_pos) > 1 )<br>
^<br>
ffmpeg.C:3922:5: note: use function 'std::abs' instead<br>
if( abs(pos-aud->curr_pos) > 1 )<br>
^~~<br>
std::abs<br>
ffmpeg.C:3922:5: note: include the header <cstdlib> or explicitly provide a declaration for 'std::abs'<br>
ffmpeg.C:3955:19: error: no member named 'nb_index_entries' in 'AVStream'<br>
int nb_ent = st->nb_index_entries;<br>
~~ ^<br>
ffmpeg.C:3958:27: error: no member named 'index_entries' in 'AVStream'<br>
AVIndexEntry *ep = &st->index_entries[nb_ent-1];<br>
~~ ^<br>
6 warnings and 4 errors generated.<br>
make[2]: *** [Makefile:563: i686/ffmpeg.o] Error 1<br>
make[2]: *** Waiting for unfinished jobs....<br>
<br>
-----<br>
<br>
Fix may be as simple as adding internal-> to those lines ...<br>
<br>
Looking at ffmpeg commit above ....<br>
<br>
<a href="https://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff/7e87288f73242dac6344e65f892569102893fac0..cea7c19cda0ea1630ae1de8c102ab14231b9db10:/libavformat/flacdec.c" rel="noreferrer" target="_blank">https://git.ffmpeg.org/gitweb/ffmpeg.git/blobdiff/7e87288f73242dac6344e65f892569102893fac0..cea7c19cda0ea1630ae1de8c102ab14231b9db10:/libavformat/flacdec.c</a><br>
<br>
- if(index<0 || index >= s->streams[0]->nb_index_entries)<br>
+ if(index<0 || index >= s->streams[0]->internal->nb_index_entries)<br>
<br>
(from flac demuxer)<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>