• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · ad1c8dd6
    Michael Niedermayer authored
    * qatar/master:
      fate: add dxtory test
      adx_parser: rewrite.
      adxdec: Validate channel count to fix a division by zero.
      adxdec: Do not require extradata.
      cmdutils: K&R reformatting cosmetics
      alacdec: implement the 2-pass prediction type.
      alacenc: implement the 2-pass prediction type.
      alacenc: do not generate invalid multi-channel ALAC files
      alacdec: fill in missing or guessed info about the extradata format.
      utvideo: proper median prediction for interlaced videos
      lavu: bump lavu minor for av_popcount64
      dca: K&R formatting cosmetics
      dct: K&R formatting cosmetics
      lavf: flush decoders in avformat_find_stream_info().
      win32: detect number of CPUs using affinity
      Add av_popcount64
      snow: Restore three mistakenly removed casts.
    
    Conflicts:
    	cmdutils.c
    	doc/APIchanges
    	libavcodec/adx_parser.c
    	libavcodec/adxdec.c
    	libavcodec/alacenc.c
    	libavutil/avutil.h
    	tests/fate/screen.mak
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ad1c8dd6
common.h 11.3 KB