[FFmpeg-cvslog] Merge commit '2e06758479650f6e2a8820c7105f2d193a701175' into release/1.1
Michael Niedermayer
git at videolan.org
Sun May 12 12:13:36 CEST 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May 12 12:02:26 2013 +0200| [50a3442120e685963649417a6455ce90cf45b653] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=50a3442120e685963649417a6455ce90cf45b653
---
More information about the ffmpeg-cvslog
mailing list