[FFmpeg-cvslog] Merge commit '6b7b8585d73548f08b98959df39d80b97677662f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 23 19:01:12 2014 +0200| [c867be03f61ebce3b87033137d0012a660b8ff75] | committer: Michael Niedermayer

Merge commit '6b7b8585d73548f08b98959df39d80b97677662f'

* commit '6b7b8585d73548f08b98959df39d80b97677662f':
  dca: Convert dca_dmixtable to integers

Conflicts:
	libavcodec/dcadec.c

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

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