Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 12:30:03 +0000 (13:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 31 Oct 2012 12:43:33 +0000 (13:43 +0100)
commit3174616f598665cfbe0c920d6e6c4d027fda9ca5
treee463c628d079a260c5e9e7d5597cf26ef5e2c17a
parent976175fbe559527389bff397b3174a27b20ab715
parent6860b4081d046558c44b1b42f22022ea341a2a73
Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

* commit '6860b4081d046558c44b1b42f22022ea341a2a73':
  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: Michael Niedermayer <michaelni@gmx.at>
35 files changed:
libavcodec/cngdec.c
libavcodec/cngenc.c
libavcodec/x86/ac3dsp.asm
libavcodec/x86/dct32.asm
libavcodec/x86/deinterlace.asm
libavcodec/x86/diracdsp_yasm.asm
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dwt_yasm.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/imdct36.asm
libavcodec/x86/proresdsp.asm
libavcodec/x86/v210.asm
libavcodec/x86/vc1dsp.asm
libavcodec/x86/vp3dsp.asm
libavcodec/x86/vp56dsp.asm
libavcodec/x86/vp8dsp.asm
libavfilter/x86/hqdn3d.asm
libavutil/x86/cpuid.asm
libavutil/x86/float_dsp.asm
libavutil/x86/x86util.asm
libswresample/x86/audio_convert.asm
libswresample/x86/rematrix.asm
libswscale/x86/input.asm
libswscale/x86/output.asm
libswscale/x86/scale.asm