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)
* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e':
  mpegts: Mark the muxer as supporting variable fps

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

Simple merge