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)
* commit 'd5fda00efa756387cffb4d7294691cd54cfe86cf':
  mpeg4videoenc: Kill non-compiling disabled cruft

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

Simple merge