Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Feb 2015 21:31:53 +0000 (22:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 14 Feb 2015 21:32:23 +0000 (22:32 +0100)
commit6c44dd6c6ee60aaa706cb4b58db79a8857cda648
tree67c760ac76bb3e8222581dd9d88ab1d71c33f82e
parent877c038a9db5e2b7c43b267ce807d81fe3637f7a
parent8a213179aff0174d81b3e889134a3b4f7d21f5c3
Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'

* commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3':
  dca: Remove trace debugging code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadec.c