diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:14:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-16 14:24:11 +0200 |
| commit | f276a490f01bd31b3c9b6111867745e72da7e59d (patch) | |
| tree | 26979a20f820b8d32a9f5a00b7dfea500205d148 /libavformat/ffmenc.c | |
| parent | d214e5cfb414ea2b8cbcf3c4300288b130388d4a (diff) | |
| parent | 3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b (diff) | |
Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'
* commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b':
avformat: fix typo in avformat_close_input
mp3enc: write Xing TOC
mp3enc: support MPEG-2 and MPEG-2.5 in Xing header.
mp3enc: downgrade some errors in writing Xing frame to warnings
lavf: flush the output AVIOContext in av_write_trailer().
lavf: cosmetics, reformat av_write_trailer().
avio: flush the internal buffer in avio_close()
Enhance doc on asyncts audiofilter
cmdutils: avoid setting data pointers to invalid values in alloc_buffer()
libavcodec: remove av_destruct_packet_nofree()
Conflicts:
libavcodec/avpacket.c
libavformat/mp3enc.c
libavformat/nutenc.c
libavformat/utils.c
libavformat/version.h
tests/ref/lavf/voc
tests/ref/lavf/voc_s16
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffmenc.c')
| -rw-r--r-- | libavformat/ffmenc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/ffmenc.c b/libavformat/ffmenc.c index 3b96c732df..1aa4775a03 100644 --- a/libavformat/ffmenc.c +++ b/libavformat/ffmenc.c @@ -225,15 +225,12 @@ static int ffm_write_packet(AVFormatContext *s, AVPacket *pkt) static int ffm_write_trailer(AVFormatContext *s) { - AVIOContext *pb = s->pb; FFMContext *ffm = s->priv_data; /* flush packets */ if (ffm->packet_ptr > ffm->packet) flush_packet(s); - avio_flush(pb); - return 0; } |