Commit 1680f9c5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4512ee78'

* commit '4512ee78':
  mpegts: Mark the muxer as supporting variable fps
Merged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 4e160ecd 4512ee78
......@@ -1542,6 +1542,6 @@ AVOutputFormat ff_mpegts_muxer = {
.write_header = mpegts_write_header,
.write_packet = mpegts_write_packet,
.write_trailer = mpegts_write_end,
.flags = AVFMT_ALLOW_FLUSH,
.flags = AVFMT_ALLOW_FLUSH | AVFMT_VARIABLE_FPS,
.priv_class = &mpegts_muxer_class,
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment