Browse Source

Merge commit '73084391588b0f150737990038829cac5013dd68'

* commit '73084391588b0f150737990038829cac5013dd68':
  lavf: Don't explicitly flush after each written packet in muxers

Conflicts:
	libavformat/assenc.c
	libavformat/yuv4mpeg.c

See: 8de9bb6e5e

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
7b836487a9
1 changed files with 1 additions and 0 deletions
  1. +1
    -0
      libavformat/assenc.c

+ 1
- 0
libavformat/assenc.c View File

@@ -87,6 +87,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
} else { } else {
avio_write(s->pb, pkt->data, pkt->size); avio_write(s->pb, pkt->data, pkt->size);
} }

return 0; return 0;
} }




Loading…
Cancel
Save