Michael Niedermayer aff0912da5 Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'
* commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd':
  mpegts: Provide an option to override the pcr period

Conflicts:
	doc/muxers.texi
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-10 23:55:57 +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
2012-12-21 00:18:34 +01:00
2013-08-29 22:52:04 +02:00
2013-02-14 23:45:48 +01:00