opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 15:49:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  Drop git- prefix from version labels
  Use the contents of RELEASE as version fallback instead of 'UNKNOWN'
  path64/open64: filter out unsupported flags
  Add Release Notes
  sipr: Drop unused DSPContext
  sipr: include string.h for mem*()
  sipr: Use memmove() to copy overlapped buffers.
  h264: drop some ugly casts

Conflicts:
	version.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-06-20 03:49:51 +02:00
parent 4aeb776913 8d3d3436e2
commit 56e11d2305
7 changed files with 60 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
version.sh
View File

@ -3,11 +3,10 @@
# 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
test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null)
# releases extract the version number from the VERSION file
version=$(cd "$1" && cat VERSION 2> /dev/null)