Merge commit '4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:23:38 +0000 (13:23 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:23:38 +0000 (13:23 +0200)
commit2335e189fb7bcbee2eac6ec9a5756c29f6782a5b
treeff83417bbabfa7aadfc681f66425488765b8ccf1
parent5114c62902d3726b898df5628b1eaf98b4a87027
parent4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad
Merge commit '4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad'

* commit '4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad':
  msmpeg4: Remove commented-out debug logging code

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/msmpeg4dec.c