1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
FFmpeg/libavformat
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-05-17 20:13:33 +02:00
2014-06-03 10:58:19 -08:00
2014-05-20 00:00:45 +02:00
2014-06-03 10:58:19 -08:00
2014-05-20 00:00:45 +02:00
2014-06-03 10:58:19 -08:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2014-04-01 01:13:09 +02:00
2014-04-14 21:40:59 +02:00
2014-04-05 02:18:09 +02:00
2014-04-22 20:44:31 +02:00
2014-06-03 10:58:19 -08:00
2014-05-07 23:39:47 +02:00
2014-05-17 20:13:33 +02:00
2014-04-27 15:14:32 +02:00
2014-04-20 20:56:02 +02:00
2014-05-07 23:39:47 +02:00
2014-06-07 14:43:07 +02:00
2014-04-15 13:51:48 +02:00