Merged-by: Michael Niedermayer <michaelni@gmx.at>
Not Pulled:
    commit 42cfb3835b5dad327b7dc22740e8b6e482ecfcd2
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Mon Feb 28 18:06:58 2011 +0000
        Remove Sonic experimental audio codec
    commit 2912e87a6c9264d556734e2bf94a99c64cf9b102
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Fri Mar 18 17:35:10 2011 +0000
        Replace FFmpeg with Libav in licence headers
		
	
			
		
			
				
	
	
		
			30 lines
		
	
	
		
			738 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			30 lines
		
	
	
		
			738 B
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
# check for git short hash
 | 
						|
if ! test "$revision"; then
 | 
						|
    revision=$(cd "$1" && git describe --tags --match N 2> /dev/null)
 | 
						|
    test "$revision" && revision=git-$revision
 | 
						|
fi
 | 
						|
 | 
						|
# no revision number found
 | 
						|
test "$revision" || revision=UNKNOWN
 | 
						|
 | 
						|
# releases extract the version number from the VERSION file
 | 
						|
version=$(cd "$1" && cat VERSION 2> /dev/null)
 | 
						|
test "$version" || version=$revision
 | 
						|
 | 
						|
test -n "$3" && version=$version-$3
 | 
						|
 | 
						|
if [ -z "$2" ]; then
 | 
						|
    echo "$version"
 | 
						|
    exit
 | 
						|
fi
 | 
						|
 | 
						|
NEW_REVISION="#define FFMPEG_VERSION \"$version\""
 | 
						|
OLD_REVISION=$(cat version.h 2> /dev/null)
 | 
						|
 | 
						|
# Update version.h only on revision changes to avoid spurious rebuilds
 | 
						|
if test "$NEW_REVISION" != "$OLD_REVISION"; then
 | 
						|
    echo "$NEW_REVISION" > "$2"
 | 
						|
fi
 |