Merge commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c'
authorClément Bœsch <u@pkh.me>
Sat, 25 Jun 2016 08:46:08 +0000 (10:46 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 25 Jun 2016 08:46:08 +0000 (10:46 +0200)
commitb45348130a60702010a7da0113c34c4df54c27f8
treed840a1297963b838922e0f980c4392bd03f1bf31
parent1e9b79b2dbc389051bddeb7975dfab28c0409b57
parent0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c
Merge commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c'

* commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c':
  lavc: revert the Makefile part of 330177b

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