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)
* commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa':
  mpegts: Support running the write_trailer function without an AVIOContext

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

Simple merge