[FFmpeg-cvslog] Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 13 08:27:03 2013 +0200| [b6ffe8afd92860a4605f12ac61226dac5e0c03cb] | committer: Michael Niedermayer

Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'

* commit '9c15ef35d404fca2adc31276c1eedb11cf485461':
  oggparsevorbis: support official chapter extension

Conflicts:
	libavformat/oggparsevorbis.c

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

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