Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
ffmpeg2theora
Commits
1e4b6699
Commit
1e4b6699
authored
May 30, 2010
by
Jan Gerber
Browse files
switch to ffmpeg 0.6 branch
parent
c0f22811
Changes
2
Show whitespace changes
Inline
Side-by-side
ffmpegrev
View file @
1e4b6699
FFMPEG_REVISION=23009
FFMPEG_CO_DIR=ffmpeg
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/branches/0.6
#not required fro 0.6 branch
# Because ffmpeg checks out libswscale via an svn:externals, checking
# out an old ffmpeg does not check out a corresponding libswscale.
# Keep the swscale checkout manually synchronized, then. Update this
# when you update FFMPEG_REVISION.
FFMPEG_EXTERNALS_REVISION=31128
#FFMPEG_REVISION=23309
#FFMPEG_EXTERNALS_REVISION=31211
get_ffmpeg_svn.sh
View file @
1e4b6699
#!/bin/sh
common
=
"--enable-version3 --enable-gpl --enable-postproc --disable-muxers --disable-encoders --enable-libvorbis"
common
=
"
$common
--disable-ffmpeg --disable-ffplay --disable-ffserver --disable-doc"
common
=
"
$common
--disable-ffmpeg --disable-ffplay --disable-ffserver
--disable-ffprobe
--disable-doc"
#optional, if you have those libs installed:
#extra="--enable-libopencore-amrnb --enable-libopencore-amrwb"
...
...
@@ -9,6 +9,9 @@ common="$common --disable-ffmpeg --disable-ffplay --disable-ffserver --disable-d
#apt-get install liba52-dev libfaad-dev libgsm1-dev
#extra="$extra--enable-libfaad --enable-libgsm"
#optional, if you have libvpx installed:
#extra="--enable-libvpx"
#linux
options
=
"
$common
--enable-pthreads
$extra
"
...
...
@@ -19,8 +22,11 @@ uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 -
.
./ffmpegrev
#Get ffmpeg from svn
svn
-r
$FFMPEG_REVISION
co
$FFMPEG_SVN
$FFMPEG_CO_DIR
svn update
-r
$FFMPEG_EXTERNALS_REVISION
$FFMPEG_CO_DIR
/libswscale
#svn -r $FFMPEG_REVISION co $FFMPEG_SVN $FFMPEG_CO_DIR
#svn update -r $FFMPEG_EXTERNALS_REVISION $FFMPEG_CO_DIR/libswscale
#Get ffmpeg from svn 0.6 branch
svn co
$FFMPEG_SVN
$FFMPEG_CO_DIR
apply_patches
()
{
cd
ffmpeg
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment