virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
31,142 Commits 37 Branches 400 Tags 467 MiB
5d35b279e2
Commit Graph

37 Commits

Author SHA1 Message Date
Michael Niedermayer
56e11d2305 Merge remote-tracking branch 'qatar/master' 
* 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>
 2011-06-20 04:07:34 +02:00
Mans Rullgard
8d3d3436e2 Drop git- prefix from version labels 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-19 19:41:23 +01:00
Reinhard Tartler
8fab4007c8 Use the contents of RELEASE as version fallback instead of 'UNKNOWN' 
This makes binaries produced by source tarballs identify themselves with
the version number of the corresponding release series, unless overriden
by a 'VERSION' file.
 2011-06-19 19:54:07 +02:00
Michael Niedermayer
8ea36711b0 Merge remote-tracking branch 'newdev/master' 
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Not Pulled:
    commit 42cfb3835b
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Mon Feb 28 18:06:58 2011 +0000

        Remove Sonic experimental audio codec

    commit 2912e87a6c
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Fri Mar 18 17:35:10 2011 +0000

        Replace FFmpeg with Libav in licence headers
 2011-03-19 20:05:11 +01:00
Janne Grunau
faa6f1c306 get rid of the last svn mentions 2011-03-18 21:57:38 +01:00
Michael Niedermayer
0cb88628fb Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*" 
This reverts commit a03be6e1ba.
 2011-03-17 17:26:45 +01:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Janne Grunau
a03be6e1ba use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_* 2011-03-16 21:54:39 +01:00
Alex Converse
ad9b2a41b8 Remove old VCSs from version.sh 
(cherry picked from commit 203df50d10)
 2011-02-22 02:44:39 +01:00
Alex Converse
203df50d10 Remove old VCSs from version.sh 2011-02-21 16:18:26 -08:00
Michael Niedermayer
40222b926b Provide monotone revission numbers in version.sh 2011-02-01 12:19:49 +01:00
Mans Rullgard
f318ee3e37 Fix quoting in version.sh 2011-01-18 20:48:23 +00:00
Ramiro Polla
8032d1dee9 use git describe for naming version in pure git clones 
Patch by: Ramiro Polla <ramiro <DOT> polla  gmail <DOT> com>

Originally committed as revision 26394 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-16 18:34:09 +00:00
Måns Rullgård
1606446248 version.sh: write version to stdout if no output file specified 
Originally committed as revision 24527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-26 23:43:59 +00:00
Ramiro Polla
15ccfff12c Read "Last Changed Rev" field instead of "Revision" field to avoid being 
affected by changes in other directories (such as branches).

Originally committed as revision 21252 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-16 18:29:52 +00:00
Ramiro Polla
9a02c3e183 Silence calls to git in version.sh. 
Originally committed as revision 21068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 19:25:03 +00:00
Ramiro Polla
8202d905cd Check for VERSION in source dir. 
Originally committed as revision 21067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 19:23:50 +00:00
Ramiro Polla
31c194e7f9 Check for snapshot_version in source dir. 
Originally committed as revision 21065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-07 17:54:17 +00:00
Alex Converse
d38b7b80d1 Check if a git-svn revision number is available to try to get better version 
information from git.

Originally committed as revision 20015 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 16:54:26 +00:00
Måns Rullgård
7f6d9b3089 version.sh: use standard sed syntax 
Originally committed as revision 19655 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-08-16 15:51:47 +00:00
Diego Biurrun
de2c2b5a98 Directly read the version number from a VERSION file; useful for releases. 
Originally committed as revision 17836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-05 23:17:11 +00:00
Diego Biurrun
2b229186a2 10l: Ignore error output from failed attempt to read snapshot_version. 
Originally committed as revision 17578 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 23:10:36 +00:00
Diego Biurrun
10671cf595 Read revision string from the file snapshot_version if available. 
This will be used by daily snapshots without Subversion metadata.

Originally committed as revision 17577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 23:04:52 +00:00
Diego Biurrun
d33a14e4f5 cosmetics: Use $() instead of ``, the former can be nested more easily. 
Originally committed as revision 17576 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-24 22:54:58 +00:00
Diego Biurrun
e73db71899 Replace 'test' invocation by 'test -n', this should be safer. 
Originally committed as revision 15434 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 21:39:22 +00:00
Diego Biurrun
ac63af34b5 Add support for passing a version string to configure that is appended to 
FFmpeg's version string output. This can be used by distributions to mark
their packages as being modified versions without hacking the sources.

Originally committed as revision 15433 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 21:37:50 +00:00
Måns Rullgård
9e6165b53e enable version.h to be created from subdirs 
Originally committed as revision 13819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-19 16:57:38 +00:00
Aurelien Jacobs
40eaf7806d add support for git in version.sh (use short hash as version number) 
Originally committed as revision 10817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-20 00:07:48 +00:00
Aurelien Jacobs
123103caa2 cosmetics to make version.sh more VCS agnostic 
Originally committed as revision 10816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-10-20 00:05:04 +00:00
Måns Rullgård
7a68f7fa22 kill error messages from failed svn revision extraction commands 
Originally committed as revision 9363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-18 19:43:11 +00:00
Måns Rullgård
c1047cda84 extract revision from svn-1.4 .svn/entries files 
Originally committed as revision 9362 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-18 19:35:19 +00:00
Michel Bardiaux
837f0ad7aa Fall back on grepping for the revision number if no svn client is installed. 
patch by Michel Bardiaux, mbardiaux mediaxim be

Originally committed as revision 6179 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-05 23:15:50 +00:00
Diego Biurrun
59d0fc5779 Use LC_ALL instead of LANG since the former overrides the latter. 
Originally committed as revision 5861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-29 23:32:10 +00:00
Diego Biurrun
7ea3b2e00e Cope with localized Subversion clients. 
Originally committed as revision 5859 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-29 21:43:24 +00:00
Måns Rullgård
54003e1a70 get svn version when using separate build tree 
Originally committed as revision 5539 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-28 20:46:58 +00:00
Diego Biurrun
a66d63a94e Produce correct version string even when not run in a Subversion working copy. 
based on a patch by Ismail Dönmez ismail##@##pardus##.##org##.##tr

Originally committed as revision 5511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-23 15:07:35 +00:00
Diego Biurrun
f1cc88a5d6 Use Subversion revision for FFMPEG_VERSION. 
based on a patch by Ismail Dönmez ismail$$at$$pardus$$dot$$org$$dot$$tr

Originally committed as revision 5502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-20 10:24:08 +00:00