[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 21 13:53:24 2014 +0100| [6e638677712837eb436c71c650f45313553b47ea] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libvorbis: Give consistent names to all functions, structs, and defines

Conflicts:
	libavcodec/libvorbisenc.c

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

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