• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 6faf0a21
    Michael Niedermayer authored
    * qatar/master: (53 commits)
      probe: Restore identification of files with very large id3 tags and no extension.
      probe: Remove id3 tag presence as a criteria to do file extension checking.
      mpegts: MP4 SL support
      mpegts: MP4 OD support
      mpegts: Add support for Sections in PMT
      mpegts: Replace the MP4 descriptor parser with a recursive parser.
      mpegts: Add support for multiple mp4 descriptors
      mpegts: Parse mpeg2 SL descriptors.
      isom: Add MPEG4SYSTEMS dummy object type indication.
      aacdec: allow output reconfiguration on channel changes
      nellymoserenc: take float input samples instead of int16
      nellymoserdec: use dsp functions for overlap and windowing
      nellymoserdec: do not fail if there is extra data in the packet
      nellymoserdec: fail if output buffer is too small
      nellymoserdec: remove pointless buffer size check.
      lavf: add init_put_byte() to the list of visible symbols.
      seek-test: free options dictionary after use
      snow: do not draw_edge if emu_edge is set
      tools/pktdumper: update to recent avformat api
      seek-test: update to recent avformat api
      ...
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/mpegaudiodec.c
    	libavcodec/nellymoserdec.c
    	libavcodec/snow.c
    	libavcodec/version.h
    	libavcodec/wmadec.c
    	libavformat/avformat.h
    	libavformat/mpegts.c
    	libavformat/mxfdec.c
    	libavformat/utils.c
    	libavformat/wtv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    6faf0a21
wmavoice.c 80.6 KB