diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-14 22:57:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-14 22:57:48 +0200 |
| commit | 7c81afdba59f59e2e6d55a1ef72b1f42de8e66fc (patch) | |
| tree | 3b2c5896714825367d45dcb01b57e0a600113bf7 | |
| parent | 65b839e43a5b32dabef63572a584e81528c2f956 (diff) | |
| parent | 40dd29653ab85812d21fa64e9a665ceb316701ad (diff) | |
| download | ffmpeg-7c81afdba59f59e2e6d55a1ef72b1f42de8e66fc.tar.gz | |
Merge commit '40dd29653ab85812d21fa64e9a665ceb316701ad' into release/2.2
* commit '40dd29653ab85812d21fa64e9a665ceb316701ad':
Prepare for 10.2 Release
Update Changelog for v10.2
Conflicts:
Changelog
RELEASE
Not merged as these dont align with our releases
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | Changelog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -2,7 +2,6 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version 2.2: - - HNM version 4 demuxer and video decoder - Live HDS muxer - setsar/setdar filters now support variables in ratio expressions |