Merge commit '34c22a9ca656603428b2c3490d1339c5a5966961'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:00:21 +0000 (16:00 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:00:21 +0000 (16:00 +0100)
* commit '34c22a9ca656603428b2c3490d1339c5a5966961':
  faan(i)dct: Kill some disabled code

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

Simple merge
Simple merge