• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 721be993
    Michael Niedermayer authored
    * qatar/master:
      cosmetics: fix some then/than typos
      doxygen: Include libavcodec and libavformat examples into the documentation
      avutil: elaborate documentation for av_get_random_seed
      Add support for aac streams in mp4/mov without extradata.
      aes: whitespace cosmetics
      adler32: whitespace cosmetics
      swscale: fix another yuv range conversion overflow in 16bit scaling.
      Fix cpu flags test program
      opt-test: Add missing braces to silence compiler warnings.
      build: Eliminate obsolete test targets.
      udp: Fix a compilation warning
      swscale: Unbreak build with --enable-small
      base64: add fate test
      aes: improve test program and add fate test
      adler32: make test program more useful and add fate test
      swscale: fix yuv range correction when using 16-bit scaling.
      aacenc: Make chan_map const correct
    
    Conflicts:
    	Makefile
    	doc/examples/muxing-example.c
    	libavformat/udp.c
    	libavutil/random_seed.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    721be993
aacenc.h 2.8 KB