diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-15 21:29:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-15 21:29:12 +0200 |
| commit | 1680f9c588504d691688987f0299603be1c52b64 (patch) | |
| tree | 098437dd3e57bee076289dfd94bc4077b20fcbc7 /libavformat/mpegtsenc.c | |
| parent | 4e160ecdbc0561068f2e690f8e9ec714e28497d0 (diff) | |
| parent | 4512ee78e19fdb011bdec1b3a8dc0b315c82a81e (diff) | |
| download | ffmpeg-1680f9c588504d691688987f0299603be1c52b64.tar.gz | |
Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e'
* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e':
mpegts: Mark the muxer as supporting variable fps
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/mpegtsenc.c')
| -rw-r--r-- | libavformat/mpegtsenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 09f62d64ec..c74389a70e 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -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, }; |