• Michael Niedermayer's avatar
    Merge commit '3f7fd59d' · f276a490
    Michael Niedermayer authored
    * commit '3f7fd59d':
      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: default avatarMichael Niedermayer <michaelni@gmx.at>
    f276a490