1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Michael Niedermayer ac26d7ea9d Merge commit 'a736ae1e96b8718af0962106aa40df5f4b246b55'
* commit 'a736ae1e96b8718af0962106aa40df5f4b246b55':
  doc: Document mpegts muxrate

Conflicts:
	doc/muxers.texi

See: 5b76c3a1204944a74f4c1fb4ce1ebe58940e7f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 23:25:46 +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-06-03 10:58:19 -08:00
2014-05-23 23:30:21 +02:00
2014-06-09 12:41:33 +00:00
2014-05-28 03:52:50 +02:00
2014-05-28 03:52:50 +02:00