1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Michael Niedermayer 1ebc77bc7d Merge commit '49a242687cf44f86570b706db3c5912ff06bc6c2'
* commit '49a242687cf44f86570b706db3c5912ff06bc6c2':
  doc: Document segment_list_type

Conflicts:
	doc/muxers.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-18 23:13:31 +02:00
..
2014-06-03 10:58:19 -08:00
2014-06-03 10:58:19 -08:00
2014-06-03 10:58:19 -08:00
2014-05-23 23:30:21 +02:00
2014-06-18 14:55:28 +02:00
2014-05-28 03:52:50 +02:00