[FFmpeg-cvslog] avformat/mpegtsenc: do not flush after everything

Michael Niedermayer git at videolan.org
Sun Aug 3 18:23:50 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug  3 17:46:06 2014 +0200| [6cdf409884bd2eef95bb478dfb04c1149dade155] | committer: Michael Niedermayer

avformat/mpegtsenc: do not flush after everything

there is flushing code in the avformat core that does this in a more
controlled way.

Fixes ticket2748

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6cdf409884bd2eef95bb478dfb04c1149dade155
---

 libavformat/mpegtsenc.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index a4a32e0..aebf998 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -746,8 +746,6 @@ static int mpegts_write_header(AVFormatContext *s)
         }
     }
 
-    avio_flush(s->pb);
-
     return 0;
 
  fail:
@@ -1139,7 +1137,6 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
         mpegts_prefix_m2ts_header(s);
         avio_write(s->pb, buf, TS_PACKET_SIZE);
     }
-    avio_flush(s->pb);
     ts_st->prev_payload_key = key;
 }
 
@@ -1312,7 +1309,6 @@ static void mpegts_write_flush(AVFormatContext *s)
             ts_st->payload_size = 0;
         }
     }
-    avio_flush(s->pb);
 }
 
 static int mpegts_write_packet(AVFormatContext *s, AVPacket *pkt)



More information about the ffmpeg-cvslog mailing list