diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 12:02:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-12 12:13:09 +0200 |
| commit | 50a3442120e685963649417a6455ce90cf45b653 (patch) | |
| tree | a0c1b610782fd86e995c36cb5711515f9361f8db /cmdutils.h | |
| parent | 008ae91bcca7f9bc3ae5d04e92f925b0ab771f07 (diff) | |
| parent | 2e06758479650f6e2a8820c7105f2d193a701175 (diff) | |
| download | ffmpeg-50a3442120e685963649417a6455ce90cf45b653.tar.gz | |
Merge commit '2e06758479650f6e2a8820c7105f2d193a701175' into release/1.1
* commit '2e06758479650f6e2a8820c7105f2d193a701175':
Prepare for 9.5 Release
update Changelog
add missed CVE reference in 9.2 release
fate: fetch samples that match the release series
Conflicts:
Changelog
RELEASE
tests/Makefile
The rsync change is not merged
We need to maintain the ability to checkout and test old revissions
from master. This implies that the default sample repository has the
needed samples for both older and newer revissions. Thus there is no
need for a seperate one for each release.
Comments & Suggestions of course welcome
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils.h')
0 files changed, 0 insertions, 0 deletions