[FFmpeg-cvslog] Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Feb 14 22:40:35 2015 +0100| [d2223ec2bd36aae6a48c90bec3ebe4d0dc2eb421] | committer: Michael Niedermayer

Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'

* commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664':
  dca: Move all tables into dcadata.h

Conflicts:
	libavcodec/dcadec.c

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

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