Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:01:30 +0000 (00:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:01:30 +0000 (00:01 +0100)
commit4104eb44e629d1469918e73587649fd3b2d992ba
tree483dacda734e81247a01f747dea59f93c5f452db
parenta9b1936a4e46137c80c4c8300cfc68ca2a317b90
parent55519926ef855c671d084ccc151056de9e3d3a77
Merge commit '55519926ef855c671d084ccc151056de9e3d3a77'

* commit '55519926ef855c671d084ccc151056de9e3d3a77':
  x86: Make function prototype comments in assembly code consistent

Conflicts:
libavcodec/x86/sbrdsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
24 files changed:
libavcodec/x86/dsputil.asm
libavcodec/x86/dsputilenc.asm
libavcodec/x86/fmtconvert.asm
libavcodec/x86/fpel.asm
libavcodec/x86/h263_loopfilter.asm
libavcodec/x86/h264_chromamc.asm
libavcodec/x86/h264_chromamc_10bit.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_qpel_10bit.asm
libavcodec/x86/h264_weight.asm
libavcodec/x86/h264_weight_10bit.asm
libavcodec/x86/hpeldsp.asm
libavcodec/x86/mpeg4qpel.asm
libavcodec/x86/proresdsp.asm
libavcodec/x86/qpel.asm
libavcodec/x86/rv40dsp.asm
libavcodec/x86/sbrdsp.asm
libavcodec/x86/vp8dsp.asm
libavcodec/x86/vp8dsp_loopfilter.asm