Hi All, If instead of the various separate patch series i have sent the last few days, you would like to see one integrated series where all are applied on top of each other and conflicts resolves, please see all the commits ahead of master (currently 22) on the develop branch here: https://github.com/dcnieho/ffmpeg/tree/develop
In making this branch, i have also done some small refactoring, and fixed some issues i came across in my implementation. As said before, I hope one of you can advise me on how to submit all this (one big series so it all applies cleanly?). The brunt is letting dshow provide more information about what video data it provides, and especially making it way more controllable programmatically/through the API. It is now at a point where i can use ffmpeg/dshow as a backend to flexible, reconfigurable use of e.g. a webcam. Exciting to me:) All the best, Dee On Fri, Jun 4, 2021 at 2:22 PM Diederick C. Niehorster <dcni...@gmail.com> wrote: > > Hi Nicolas, > > On Fri, Jun 4, 2021 at 11:06 AM Nicolas George <geo...@nsup.org> wrote: > > I do not understand: you did send them as a large patch series. Twice, > > by the way, which is confusing. > > Yes, the first series got messed up, send it a second time correctly. > I've cleaned up patchwork, it only shows the right ones. > > I have sent multiple patch series, all of which apply cleanly to > master, but some of which heavily conflict with each other. E.g. > https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=4090, > https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=4088 and > https://patchwork.ffmpeg.org/project/ffmpeg/list/?series=4100 > implement different features, but each heavily edit overlapping code. > Once one is merged, the others will conflict. Should i put these all > in one large series implementing multiple features? > > > It is the way to do it: make clean commits in your Git tree, using > > rebase if necessary to make them really clean. Then let git format-patch > > or send-email make a patch series, with each patch stacking on top of > > the other. > > Thanks! send-email I have made some mistakes with my first times here, > sorry again for the double patches. > > Cheers, > Dee _______________________________________________ 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".