Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 10:21:47 +0000 (11:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 10:21:47 +0000 (11:21 +0100)
commit44fa2671e0db0bb1a92c365fb3c9c2d1cd7199ca
tree3eede210817e4cd60b1a868cfc74ccf6955495a7
parent5f7887ca8d056d2debdd2c3b205ada7305d9ac07
parent5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70
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@gmx.at>
doc/APIchanges
libavcodec/Makefile
libavcodec/libvorbisenc.c
libavcodec/version.h
libavcodec/vorbis_parser.c
libavcodec/vorbis_parser.h
libavcodec/vorbis_parser_internal.h
libavformat/oggparsevorbis.c