Merge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:06:49 +0000 (16:06 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 15:06:49 +0000 (16:06 +0100)
* commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c':
  msmpeg4: Drop disabled debug cruft

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

Simple merge
Simple merge