virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'newdev/master'

Browse Source 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-03-17 17:22:52 +01:00
parent e309fdc701 f1f60f5252
commit 0fecf2642b
174 changed files with 1109 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version.sh
+1 -1
View File
@@ -23,7 +23,7 @@ if [ -z "$2" ]; then
exit
fi
NEW_REVISION="#define FFMPEG_VERSION \"$version\""
NEW_REVISION="#define LIBAV_VERSION \"$version\""
OLD_REVISION=$(cat version.h 2> /dev/null)
# Update version.h only on revision changes to avoid spurious rebuilds