Merge commit 'e2b9993558b6adee42dcc6eb385a14943aaca974'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:11:11 +0000 (16:11 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:11:11 +0000 (16:11 +0100)
commit8695ce73ca899a33015c617fd64721dc45c3bcd7
tree2b6d2e7e9b8e26cb49b0ef2bfc031a3305c76049
parentff66ba6feb3e996d5984ee3f7ae2ff9c7d946d0b
parente2b9993558b6adee42dcc6eb385a14943aaca974
Merge commit 'e2b9993558b6adee42dcc6eb385a14943aaca974'

* commit 'e2b9993558b6adee42dcc6eb385a14943aaca974':
  simple_idct: x86: Drop disabled IDCT implementation

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