[FFmpeg-cvslog] Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 22 21:14:43 2014 +0200| [300d489ac9bb11b67bde90521d43d12fe68be72e] | committer: Michael Niedermayer

Merge commit '051aadeed104ecbe8ee4850ec2d7e5394f5e1ccd'

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

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=300d489ac9bb11b67bde90521d43d12fe68be72e
---