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)
commit87cd8dc0b0b2293fddeb94c6c5c12a27ec3874cf
tree12692820c092d7e4b3c19ff4c33dc2f73bc9980d
parent56d63208d8249be3d2a54b8a25c27fc178d84df0
parentbe1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e
Merge commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e'

* commit 'be1db21ba88fe86036fea9f8d2c1a5f47c2a0a7e':
  mathops: Drop disabled alternative mid_pred() implementation

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