[FFmpeg-cvslog] Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov  6 12:05:17 2014 +0100| [f74be3669daa8b471fb8919fa980d9bed3207af2] | committer: Michael Niedermayer

Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'

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

Conflicts:
	libavformat/oggparsevorbis.c

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

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