diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:38:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 20:38:41 +0200 |
| commit | f953c3c2343dc78c45a001aa38ecb20cee447df7 (patch) | |
| tree | d418b2fd2b0ebcf44ad262f3bd2c3d53df892fbf /libavcodec/svq1enc_cb.h | |
| parent | dcce698fd88768264614eb139fc62b2340bff787 (diff) | |
| parent | bd41211395fd1f968e9f3a4746daffebea60f41e (diff) | |
| download | ffmpeg-f953c3c2343dc78c45a001aa38ecb20cee447df7.tar.gz | |
Merge commit 'bd41211395fd1f968e9f3a4746daffebea60f41e' into release/1.1
* commit 'bd41211395fd1f968e9f3a4746daffebea60f41e':
Re-release 9.15 as 9.16
Prepare for 9.15 Release
Update Changelog for v9.15
Conflicts:
Changelog
RELEASE
Not merged, as the versions are different in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq1enc_cb.h')
0 files changed, 0 insertions, 0 deletions