[Cin] ffmpeg.git changes for mpegts muxer