Merge commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 12:48:07 +0000 (13:48 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 12:48:07 +0000 (13:48 +0100)
commitefcba5a06acff1276ef30142ef2f881307c68248
tree8d7f83f0446246b985426e57b09c18b07243d278
parent3f049646717f2bd72bbc4278c623dad6ddb7cd9e
parentd5fda00efa756387cffb4d7294691cd54cfe86cf
Merge commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf'

* commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf':
  mpeg4videoenc: Kill non-compiling disabled cruft

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