Michael Niedermayer 300d489ac9 Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd' ...

* commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd':
  ogg: Provide aliases for Speex, Opus and audio-only ogg

Conflicts:
	Changelog
	libavformat/oggenc.c
	libavformat/version.h

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

2014-08-22 21:41:00 +02:00

17 KiB

Raw Blame History

View Raw