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/asfenc.c | |
| parent | d214e5cfb414ea2b8cbcf3c4300288b130388d4a (diff) | |
| parent | 3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b (diff) | |
| download | ffmpeg-f276a490f01bd31b3c9b6111867745e72da7e59d.tar.gz | |
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/asfenc.c')
| -rw-r--r-- | libavformat/asfenc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 23f11427e1..8d169f7e2e 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -893,7 +893,6 @@ static int asf_write_trailer(AVFormatContext *s) asf_write_header1(s, file_size, data_size - asf->data_offset); } - avio_flush(s->pb); av_free(asf->index_ptr); return 0; } |