]> git.sesse.net Git - ffmpeg/commit
Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e'
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 15 Jul 2015 19:29:07 +0000 (21:29 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 15 Jul 2015 19:29:12 +0000 (21:29 +0200)
commit1680f9c588504d691688987f0299603be1c52b64
tree098437dd3e57bee076289dfd94bc4077b20fcbc7
parent4e160ecdbc0561068f2e690f8e9ec714e28497d0
parent4512ee78e19fdb011bdec1b3a8dc0b315c82a81e
Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e'

* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e':
  mpegts: Mark the muxer as supporting variable fps

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mpegtsenc.c