Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 11:05:17 +0000 (12:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 11:05:17 +0000 (12:05 +0100)
commitf74be3669daa8b471fb8919fa980d9bed3207af2
treebfdf6fa599e90dab47753d0b7974421d6766023f
parent7ffdc7bef2f9d7e90487f816a97a3496b0639450
parent2f3fadfbe3c6ad52fad5c614b6067c5401227959
Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'

* commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959':
  lavc,lavf: switch to the new vorbis parse API

Conflicts:
libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libvorbisenc.c
libavcodec/vorbis_parser.c
libavformat/oggparsevorbis.c