Age | Commit message (Collapse) | Author |
|
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
|
|
|
|
This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.
|
|
Conflicts:
Changelog
doc/APIchanges
doc/optimization.txt
libavformat/avio.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
|
|
|
|
(cherry picked from commit 203df50d1013ea59e558d63f3ea69ffae1249124)
|
|
|
|
|
|
|
|
Patch by: Ramiro Polla <ramiro <DOT> polla gmail <DOT> com>
Originally committed as revision 26394 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 24527 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
affected by changes in other directories (such as branches).
Originally committed as revision 21252 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21068 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21067 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 21065 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
information from git.
Originally committed as revision 20015 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 19655 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17836 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17578 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
This will be used by daily snapshots without Subversion metadata.
Originally committed as revision 17577 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 17576 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 15434 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
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
|
|
Originally committed as revision 13819 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 10817 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 10816 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9363 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 9362 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
patch by Michel Bardiaux, mbardiaux mediaxim be
Originally committed as revision 6179 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 5861 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 5859 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
Originally committed as revision 5539 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
based on a patch by Ismail Dönmez ismail##@##pardus##.##org##.##tr
Originally committed as revision 5511 to svn://svn.ffmpeg.org/ffmpeg/trunk
|
|
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
|