commit 2955823a9fec80f9865c5d044effaf59d0c69f5f parent 89f766d0817833337063840b5f30b85715689ac1 Author: Heikki Lindholm <holin@iki.fi> Date: Sun, 20 Jul 2008 09:55:43 +0000 ffmpeg sync procedure Diffstat:
| M | src/plugins/thumbnailffmpeg/README | | | 21 | ++++++++++++++++++++- |
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/plugins/thumbnailffmpeg/README b/src/plugins/thumbnailffmpeg/README @@ -7,9 +7,28 @@ A local ffmpeg tree is used, because (2) mainline ffmpeg is not reentrant, (3) security issues can be handled locally. -Current base version fetch: +Originally: svn export -r 13836 --ignore-externals svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg svn export -r 27100 svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ffmpeg/libswscale +sync with ffmpeg: +FFREV=14311 +SWSREV=27330 +cd /tmp +svn co -r $FFREV --ignore-externals svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg +svn co -r $SWSREV svn://svn.mplayerhq.hu/mplayer/trunk/libswscale ffmpeg/libswscale +cd Extractor/src/plugins/thumbnailffmpeg +# copy, rsync skips .svn dirs +rsync -aC ffmpeg /tmp/ +cd /tmp/ffmpeg +svn update +<resolve conflicts> +cd Extractor/src/plugins/thumbnailffmpeg +rsync -aC /tmp/ffmpeg . +# check for deletions +diff -qr . /tmp/ffmpeg -x .svn +<svn delete ...> +# check for additions +<svn status, svn add> Plan: test & enable ffmpeg decoders one by one tests: