* 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>