Merge commit 'd7913bf5'

* commit 'd7913bf5': changelog: Move Ogg subtypes aliases entry to the correct release Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'd7913bf5'
* commit 'd7913bf5': changelog: Move Ogg subtypes aliases entry to the correct release Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
2178abd3 · Michael Niedermayer · 52ec81c6 · d7913bf5 · 2178abd3
Commit 2178abd3 authored Sep 05, 2014 by Michael Niedermayer
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Changelog Changelog +1 -0

No files found.
--- a/Changelog
+++ b/Changelog
@@ -80,6 +80,7 @@ version 2.2:
 - libx265 encoder
 - dejudder filter
 - Autodetect VDA like all other hardware accelerations
+- aliases and defaults for Ogg subtypes (opus, spx)


 version 2.1: