[FFmpeg-cvslog] Merge commit 'f121dbd9f76031d7f6d56261be2f14937a19d2dd'

Michael Niedermayer git at videolan.org
Wed Jun 11 00:08:50 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 10 23:43:52 2014 +0200| [aff0912da551ed93e8e37ae3e4f2d18cc79cdb36] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=aff0912da551ed93e8e37ae3e4f2d18cc79cdb36
---





More information about the ffmpeg-cvslog mailing list