Merge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:12:07 +0000 (16:12 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:12:07 +0000 (16:12 +0100)
commita754fae4a7e1940ed81be54fcc824cd28ed20d2b
tree4210baa3f2c3d840cda3c6ecc4db72fa1411ebc4
parent8695ce73ca899a33015c617fd64721dc45c3bcd7
parent014852e932dab6e9cf2a53e7a17ce8321f3e922c
Merge commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c'

* commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c':
  simple_idct: arm: Drop disabled code variant

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/arm/simple_idct_armv5te.S