Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'

* commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa': mpegts: Support running the write_trailer function without an AVIOContext Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 6b0f54ddc7
parent 3a15168a6e e2ce163922
commit 6b0f54ddc7
1 changed files with 2 additions and 1 deletions
--- a/libavformat/mpegtsenc.c
+++ b/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++) {