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

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

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