[FFmpeg-cvslog] Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 11:21:47 2014 +0100| [44fa2671e0db0bb1a92c365fb3c9c2d1cd7199ca] | committer: Michael Niedermayer

Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'

* commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70':
  lavc: add a public API for parsing vorbis packets.

Conflicts:
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/version.h
	libavcodec/vorbis_parser.c

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

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