Commit 2178abd3 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'd7913bf5'

* commit 'd7913bf5':
  changelog: Move Ogg subtypes aliases entry to the correct release

Conflicts:
	Changelog
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 52ec81c6 d7913bf5
...@@ -80,6 +80,7 @@ version 2.2: ...@@ -80,6 +80,7 @@ version 2.2:
- libx265 encoder - libx265 encoder
- dejudder filter - dejudder filter
- Autodetect VDA like all other hardware accelerations - Autodetect VDA like all other hardware accelerations
- aliases and defaults for Ogg subtypes (opus, spx)
version 2.1: version 2.1:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment