FFmpeg/libavformat
Michael Niedermayer b6ffe8afd9 Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'
* commit '9c15ef35d404fca2adc31276c1eedb11cf485461':
  oggparsevorbis: support official chapter extension

Conflicts:
	libavformat/oggparsevorbis.c

See: 04b9836274f390e39879c2666f7967990f0382cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 08:28:05 +02:00
..
2013-10-12 20:21:38 +00:00
2013-10-06 19:36:53 +02:00
2013-09-18 14:10:05 -04:00
2013-09-21 15:36:33 +02:00
2013-09-21 03:26:54 +02:00
2013-07-07 18:50:03 +02:00
2013-09-21 15:36:33 +02:00
2013-09-21 15:36:33 +02:00
2013-08-23 20:05:35 +02:00
2013-09-21 15:36:33 +02:00
2013-08-05 10:14:42 +02:00
2013-08-21 05:51:41 +02:00
2013-09-21 15:36:33 +02:00