Le mer. 2 avr. 2025 à 16:30, Michael Niedermayer <mich...@niedermayer.cc> a écrit : > > Hi Romain > > On Wed, Apr 02, 2025 at 07:43:03PM +0200, Michael Niedermayer wrote: > > On Mon, Mar 24, 2025 at 09:50:52AM -0500, Romain Beauxis wrote: > > > --- > > > libavcodec/decode.c | 131 ++++++++++++++++++++++++++++++++++++++++++++ > > > 1 file changed, 131 insertions(+) > > > > doesnt apply cleanly: > > > > Applying: libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_UPDATE` packet extra data, attach them to the next decoded frame with the same PTS. > > Using index info to reconstruct a base tree... > > M libavcodec/decode.c > > .git/rebase-apply/patch:74: tab in indent. > > ret->data = pending->data; > > > warning: 1 line adds whitespace errors. > > We cannot push changes with whitespace errors (like trailing whitespace > and tabs in places where they are not needed by syntax rules) > theres a git hook that blocks that on the server > > maybe just post a link to your git branch so you dont have to repost > the whole set to the ML after you fix these
The 8 commits from the ogg patchset are here: https://github.com/toots/FFmpeg/pull/2/commits. Git remote url: https://github.com/toots/FFmpeg.git, branch: ogg-chained-metadata. I have double checked for trailing white space and tab used as indentation should be good now. Samples url is unchanged: https://www.dropbox.com/scl/fo/xrtrna2rxr1j354hrtymq/AGwemlxHYecBLNmQ8Fsy--4?rlkey=lzilr4m9w4gfdqygoe172vvy8&dl=0 > thx > > [...] > > -- > Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB > > Dictatorship: All citizens are under surveillance, all their steps and > actions recorded, for the politicians to enforce control. > Democracy: All politicians are under surveillance, all their steps and > actions recorded, for the citizens to enforce control. > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
