• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9dcc4c30
    Michael Niedermayer authored
    * qatar/master:
      configure: add support for bdver1 and bdver2 CPU types.
      avio: make avio_close NULL the freed buffer
      pixdesc: cosmetics
      proresenc: Don't free a buffer not owned by the codec
      proresenc: Write the full value in one put_bits call
      adpcmenc: Calculate the IMA_QT predictor without overflow
      x86: Add convenience macros to check for CPU extensions and flags
      x86: h264dsp: drop some unnecessary ifdefs around prototype declarations
      mss12: merge decode_pixel() and decode_top_left_pixel()
      mss12: reduce SliceContext size from 1067 to 164 KB
      mss12: move SliceContexts out of the common context into the codec contexts
    
    Conflicts:
    	libavformat/aviobuf.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9dcc4c30
mss12.h 4.92 KB