1. ffmpeg
  2. Commit 2178abd3b5311dd334f0380ea9521b18e4f2e564
Browse code

Merge commit 'd7913bf59ccbf781ce57c5d58998e8f25d10e040'

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

Conflicts:
Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2014/09/05 11:45:30
Showing 1 changed files
Changelog
History View file @ 2178abd
... ... 
@@ -80,6 +80,7 @@ version 2.2:
80 80 
 - libx265 encoder
81 81 
 - dejudder filter
82 82 
 - Autodetect VDA like all other hardware accelerations
83 
+- aliases and defaults for Ogg subtypes (opus, spx)
83 84
84 85
85 86 
 version 2.1: