Merge commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:00:12 +0000 (00:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:00:16 +0000 (00:00 +0100)
commita9b1936a4e46137c80c4c8300cfc68ca2a317b90
treefe38d73938aa85c3c8081c8d2980307f47e3debf
parent1c788eaca9a0ad398d1b6ecc3797949ca84b42f9
parentedd1f833fa145eb9c5026877c699ebe6efca00a0
Merge commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0'

* commit 'edd1f833fa145eb9c5026877c699ebe6efca00a0':
  x86: h264_idct_10_bit: Use proper type in function prototype comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/h264_idct_10bit.asm