diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 00:33:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-20 00:33:40 +0100 |
| commit | 6b0f54ddc746fe2b7939d279837051a427f85b62 (patch) | |
| tree | fb6d3b414e0aa5d5a801aa1ee74e08e72f14578f /libavformat/mpegtsenc.c | |
| parent | 3a15168a6e9764f51d41d1e95ca1fc7386ade5ad (diff) | |
| parent | e2ce16392205d8efe9143329ed3fb5fcb15498fa (diff) | |
| download | ffmpeg-6b0f54ddc746fe2b7939d279837051a427f85b62.tar.gz | |
Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'
* commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa':
mpegts: Support running the write_trailer function without an AVIOContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegtsenc.c')
| -rw-r--r-- | libavformat/mpegtsenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index a32c6d6787..3b898da53b 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1400,7 +1400,8 @@ static int mpegts_write_end(AVFormatContext *s) MpegTSService *service; int i; - mpegts_write_flush(s); + if (s->pb) + mpegts_write_flush(s); for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; |