Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:05:13 +0000 (16:05 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:05:13 +0000 (16:05 +0100)
* commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e':
  mathops: Drop disabled alternative mid_pred() implementation

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

Simple merge