Merge commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:58:01 +0000 (11:58 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:58:01 +0000 (11:58 +0100)
commit4bb4fa28e3741663e0e76f2e2a628cfdcca6765c
tree97cad56a97bdf368fd089c3abc6eaa05a44e7863
parentfb477193cd146c3f04eee090b846400828336999
parent5801f9ed245ca5ebb57b0b5183de7a24aaece133
Merge commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133'

* commit '5801f9ed245ca5ebb57b0b5183de7a24aaece133':
  h264_intrapred: x86: Update comments left behind in 95c89da36ebeeb96b7146c0d70f46c582397da7f

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_10bit.asm