2017-04-11 4:16 GMT+08:00 Marton Balint <c...@passwd.hu>: > > > On Mon, 10 Apr 2017, Steven Liu wrote: > > 2017-04-10 7:09 GMT+08:00 Marton Balint <c...@passwd.hu>: >> >> >>> >>> On Mon, 10 Apr 2017, Steven Liu wrote: >>> >>> 2017-04-10 4:39 GMT+08:00 Nicolas George <geo...@nsup.org>: >>> >>>> >>>> Le septidi 17 germinal, an CCXXV, Michael Niedermayer a écrit : >>>> >>>>> > Its in no release, and there seems consensus that it shouldnt be >>>>> > in a release at this point, so id say remove it from release/3.3 >>>>> branch >>>>> >>>>> I think we can say that enough time has passed, and ideally it should >>>>> be >>>>> removed before the actual release. >>>>> >>>>> Steven: are you on it? >>>>> >>>>> yes, but i don't know how should i do next step. >>>>> >>>> >>>> >>>> In the 3.3 branch you should revert the original av_strreplace patch >>> (99e5d81ef997cb88b1a40e6f253f37f7cbf251d9). >>> >>> In the master branch you should apply your v3 patch (which renames the >>> function and makes it use AVBPrint), and when applying, also make sure to >>> add a line in APIChanges about av_strireplace and increase libavutil >>> minor >>> version. >>> >>> git checkout remotes/origin/release/3.3 -b 3.3 >> git revert 99e5d81ef997cb88b1a40e6f253f37f7cbf251d9 >> git push remotes/origin/release/3.3 >> > > I usually simply do this: > > git checkout release/3.3 > commit patches > git push origin release/3.3 > > You can always use the --dry-run before push to be safe.
Have revert 99e5d81ef997cb88b1a40e6f253f37f7cbf251d9 Thanks > > > Regards, > Marton > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
