[FFmpeg-cvslog] Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 14 22:31:53 2015 +0100| [6c44dd6c6ee60aaa706cb4b58db79a8857cda648] | committer: Michael Niedermayer

Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c44dd6c6ee60aaa706cb4b58db79a8857cda648
---