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)
commit95a29b1a820503950b8684b2c4242b916b0f29cc
tree9ce56b60c3d2596822ee5d858dff1058b1ab2a11
parent87cd8dc0b0b2293fddeb94c6c5c12a27ec3874cf
parentf2f145f3032bc8808708a4bd694fbce5f1b8b63c
Merge commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c'

* commit 'f2f145f3032bc8808708a4bd694fbce5f1b8b63c':
  msmpeg4: Drop disabled debug cruft

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