• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 5c15b78e
    Michael Niedermayer authored
    * qatar/master: (42 commits)
      swscale: fix signed overflow in yuv2mono_X_c_template
      snow: fix integer overflows
      svq1enc: remove stale altivec-related hack
      snow: fix signed overflow in byte to 32-bit replication
      adx: rename ff_adx_decode_header() to avpriv_adx_decode_header()
      avformat: add CRI ADX format demuxer
      adx: add an ADX parser.
      adx: move header decoding to ADX common code
      adx: calculate the number of blocks in a packet
      adx: define and use 2 new macro constants BLOCK_SIZE and BLOCK_SAMPLES
      adx: check for unsupported ADX formats
      adx: simplify encoding by using put_sbits()
      adx: calculate correct LPC coeffs
      adx: use 12-bit coefficients instead of 14-bit to avoid integer overflow
      adx: simplify adx_decode() by using get_sbits() to read residual samples
      adx: fix the data offset parsing in adx_decode_header()
      adx: remove unneeded post-decode channel interleaving
      adx: validate header values
      adx: cosmetics: general pretty-printing and comment clean-up
      adx: remove useless comments
      ...
    
    Conflicts:
    	Changelog
    	libavcodec/cook.c
    	libavcodec/fraps.c
    	libavcodec/nuv.c
    	libavcodec/pthread.c
    	libavcodec/version.h
    	libavformat/Makefile
    	libavformat/version.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    5c15b78e
Makefile 44.4 KB