Merge commit '831a1180785a786272cdcefb71566a770bfb879e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 22:59:56 +0000 (23:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 22:59:56 +0000 (23:59 +0100)
commit1c788eaca9a0ad398d1b6ecc3797949ca84b42f9
tree21283369abd6485bc016e4c0b5222e77507d20c4
parentbe879af217e8d399412db093a4879b9f798671fa
parent831a1180785a786272cdcefb71566a770bfb879e
Merge commit '831a1180785a786272cdcefb71566a770bfb879e'

* commit '831a1180785a786272cdcefb71566a770bfb879e':
  Update dsputil- and SIMD-related comments to match reality more closely

Conflicts:
libavcodec/x86/hpeldsp.asm
libavutil/arm/float_dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
21 files changed:
libavcodec/aacdec.c
libavcodec/ac3dsp.c
libavcodec/ac3dsp.h
libavcodec/arm/hpeldsp_arm.S
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/arm/videodsp_armv5te.S
libavcodec/bfin/hpeldsp_bfin.c
libavcodec/mpegvideo_motion.c
libavcodec/x86/ac3dsp.asm
libavcodec/x86/ac3dsp_init.c
libavcodec/x86/deinterlace.asm
libavcodec/x86/fdct.c
libavcodec/x86/fpel.asm
libavcodec/x86/hpeldsp.asm
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/hpeldsp_rnd_template.c
libavcodec/x86/lpc.c
libavcodec/x86/mpegaudiodsp.c
libavcodec/x86/qpel.asm
libavcodec/x86/rnd_template.c
libavutil/arm/float_dsp_init_arm.c