Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 23:33:08 +0000 (00:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 19 Dec 2014 23:33:40 +0000 (00:33 +0100)
commit6b0f54ddc746fe2b7939d279837051a427f85b62
treefb6d3b414e0aa5d5a801aa1ee74e08e72f14578f
parent3a15168a6e9764f51d41d1e95ca1fc7386ade5ad
parente2ce16392205d8efe9143329ed3fb5fcb15498fa
Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'

* commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa':
  mpegts: Support running the write_trailer function without an AVIOContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mpegtsenc.c