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)
* commit '014852e932dab6e9cf2a53e7a17ce8321f3e922c':
  simple_idct: arm: Drop disabled code variant

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

Simple merge