[FFmpeg-cvslog] Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 16 02:29:41 2015 +0100| [9d4f8366271ec98a07c805432775368825b9fbe5] | committer: Michael Niedermayer

Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'

* commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda':
  dca: Add array sizes to array declarations

Conflicts:
	libavcodec/dcadata.h

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

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