14. July 2013 22:46
...just a note to myself:
How to "rebase" the cygicl-branch on github:
If not yet done, set the upstream-server:
git remote add upstream https://github.com/FFmpeg/FFmpeg
Make sure that we are in the master - branch
git checkout master
Pull the upstream changes:
git fetch upstream
git merge upstream/master
Rebase the cygicl-branch (apply all "patches" in the cygicl to the updated master):
git rebase master cygicl
And finally push the updates to github:
git push -f
I don't know why, but the last command only works with the force-option (-f). Maybe I am doing something wrong...
So far this procedure works quite smoothly, and I will try to sync as often as possible (so that cygicl is as up-to-date as possible).
And finally, some ideas for the next steps:
- It would be cool to automate the "rebase"-process. As long as there is no merge-error, it should not be too hard to automate it and run it maybe once a day.
- Add more libraries.
- Create a VisualStudio-project which works with the C99-to-C89-converter (so that FFmpeg can be built with the Microsoft-compiler inside VisualStudio - but without the inline-assembly that would be).
- Merge the FFmpeg-extensions (small finger exercises that is) from here.
- Try to push the changes in the cygicl-branch upstream (into the official FFmpeg-codebase), at least some of them.
- Make the OpenCL-code work.
- A build for the ARM-platform (with the Microsoft compiler) would be cool - so that the code runs on Windows RT.
- have a look at mlpdsp.c - make inline-assembly work with ICL
- Re-factor and tidy up the MakeVSProject4FFmpeg
- Find a place where to put the scripts (maybe in a source-control site or so, I do not want to repost things for each update...)
BTW - here is a little (cosmetic) update of the build-scripts (from the previous post):
vsFFmpeg_scripts.zip (2.85 kb)