diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-28 21:23:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-28 21:23:32 +0200 |
| commit | c599c211fb719f07f390148352a5caef347d5af9 (patch) | |
| tree | 3fb7bb03c19e963e182ea77d7359c9f53ae816e3 /libavformat/mux.c | |
| parent | 546491667755befff551c4f6418723ec16551415 (diff) | |
| download | ffmpeg-c599c211fb719f07f390148352a5caef347d5af9.tar.gz | |
avformat/mux: fix flush_packets flag with flushing buffers
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index afdeca1afb..687f7043da 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -632,7 +632,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) if (!pkt) { if (s->oformat->flags & AVFMT_ALLOW_FLUSH) { ret = s->oformat->write_packet(s, NULL); - if (s->flush_packets && s->pb && s->pb->error >= 0) + if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS) avio_flush(s->pb); if (ret >= 0 && s->pb && s->pb->error < 0) ret = s->pb->error; |