• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 0bb57f8b
    Michael Niedermayer authored
    * qatar/master:
      Remove ffmpeg.
      aacenc: Simplify windowing
      aacenc: Move saved overlap samples to the beginning of the same buffer as incoming samples.
      aacenc: Deinterleave input samples before processing.
      aacenc: Store channel count in AACEncContext.
      aacenc: Move Q^3/4 calculation to it's own table
      aacenc: Request normalized float samples instead of converting s16 samples to float.
      aacpsy: Replace an if with FFMAX in LAME windowing.
      aacenc: cosmetics, replace 'rd' with 'bits' in codebook_trellis_rate to make it more clear what is being calculated.
      aacpsy: cosmetics, change a FIXME to a NOTE about subshort comparisons
      aacenc: cosmetics: move init() and end() to the bottom of the file.
      aacenc: aac_encode_init() cleanup
      XWD encoder and decoder
      vc1: don't read the interpfrm and bfraction elements for interlaced frames
      mxfdec: fix memleak on mxf_read_close()
      westwood: split the AUD and VQA demuxers into separate files.
    
    Conflicts:
    	.gitignore
    	Changelog
    	Makefile
    	configure
    	doc/ffmpeg.texi
    	ffmpeg.c
    	libavcodec/Makefile
    	libavcodec/aacenc.c
    	libavcodec/allcodecs.c
    	libavcodec/avcodec.h
    	libavcodec/version.h
    	libavformat/Makefile
    	libavformat/img2.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    0bb57f8b
Makefile 20.4 KB