From a9c56206b62dbd673bf27c067d8b465333a7d8e7 Mon Sep 17 00:00:00 2001 From: ddennedy Date: Thu, 18 Dec 2008 07:14:12 +0000 Subject: [PATCH] avformat/configure: checkout (--avformat-svn) or recommend (--help) a specific FFmpeg revision if this is a release version of MLT (last field of version is even). git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1270 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/avformat/configure | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure index 3dd7e63..5ab6e7d 100755 --- a/src/modules/avformat/configure +++ b/src/modules/avformat/configure @@ -1,5 +1,12 @@ #!/bin/sh +# Determine whether to recommend/use the HEAD revision of FFmpeg (unreleased) +# or a specific revision based upon whether the last digit of our version +# is even or odd. An odd MLT version number always represents unreleased. +svn_rev="15791" +micro_version=$(echo $version | cut -d . -f 3) +odd_version=$(($micro_version % 2)) +[ "$odd_version" -eq "1" ] && svn_rev="HEAD" if [ "$help" = "1" ] then @@ -14,6 +21,8 @@ FFMPEG/avformat options: --avformat-suffix=suff - Specify a custom suffix for an ffmpeg shared build --avformat-swscale - Use ffmpeg libswcale instead of img_convert + NOTE: The recommended version of FFmpeg is SVN-r$svn_rev. + EOF else @@ -85,9 +94,9 @@ else if [ ! -d "ffmpeg" ] then echo - echo "Checking out ffmpeg/avformat - no password required" + echo "Checking out ffmpeg/avformat revision $svn_rev - no password required" echo - svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg + svn checkout -r $svn_rev svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg fi [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale $svn_ffmpeg_extra ) #[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch ) -- 1.7.4.4