virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-12-20 00:33:08 +01:00
commit 6b0f54ddc7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/mpegtsenc.c
View File

@ -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];