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

@@ -1400,6 +1400,7 @@ static int mpegts_write_end(AVFormatContext *s)
     MpegTSService *service;
     int i;
 
+    if (s->pb)
         mpegts_write_flush(s);
 
     for (i = 0; i < s->nb_streams; i++) {