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)
* commit 'e2b9993558b6adee42dcc6eb385a14943aaca974':
  simple_idct: x86: Drop disabled IDCT implementation

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

Simple merge