• Michael Niedermayer's avatar
    Merge commit '6860b408' · 3174616f
    Michael Niedermayer authored
    * commit '6860b408':
      x86: include x86inc.asm in x86util.asm
      cng: Reindent some incorrectly indented lines
      cngdec: Allow flushing the decoder
      cngdec: Make the dbov variable have the right unit
      cngdec: Fix the memset size to cover the full array
      cngdec: Update the LPC coefficients after averaging the reflection coefficients
      configure: fix print_config() with broke awks
    
    Conflicts:
    	libavcodec/x86/ac3dsp.asm
    	libavcodec/x86/dct32.asm
    	libavcodec/x86/deinterlace.asm
    	libavcodec/x86/dsputil.asm
    	libavcodec/x86/dsputilenc.asm
    	libavcodec/x86/fft.asm
    	libavcodec/x86/fmtconvert.asm
    	libavcodec/x86/h264_chromamc.asm
    	libavcodec/x86/h264_deblock.asm
    	libavcodec/x86/h264_deblock_10bit.asm
    	libavcodec/x86/h264_idct.asm
    	libavcodec/x86/h264_idct_10bit.asm
    	libavcodec/x86/h264_intrapred.asm
    	libavcodec/x86/h264_intrapred_10bit.asm
    	libavcodec/x86/h264_weight.asm
    	libavcodec/x86/vc1dsp.asm
    	libavcodec/x86/vp3dsp.asm
    	libavcodec/x86/vp56dsp.asm
    	libavcodec/x86/vp8dsp.asm
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3174616f
fmtconvert.asm 11.2 KB