Files
ffmpeg/libavformat
Michael Niedermayer 04ee57ce0a Merge commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5'
* commit 'bb461370e34b1fa1637f34ce7d37b934ddb472d5':
  asfenc: mux chapters in ASF files using an ASF "marker" section

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-20 12:06:15 +02:00
..
2013-09-03 19:34:04 +02:00
2013-09-19 22:04:34 +02:00
2013-08-29 01:57:38 +02:00
2013-09-03 19:34:04 +02:00
2013-09-18 14:10:05 -04:00
2013-09-03 19:34:04 +02:00
2013-09-08 12:54:49 +02:00
2013-08-09 23:02:48 +02:00
2013-08-23 20:05:35 +02:00
2013-09-15 22:03:03 -04:00
2013-09-19 11:27:21 +02:00
2013-08-05 10:14:42 +02:00
2013-08-21 05:51:41 +02:00