Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:29:41 +0000 (02:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Feb 2015 01:29:41 +0000 (02:29 +0100)
commit9d4f8366271ec98a07c805432775368825b9fbe5
treea16e353c40204810d41410764ff541bc1d8ef630
parente86f754b1c5f1e0d2e04e2f2c20885706ae50366
parent65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda
Merge commit '65df9904ceb5477a63e99e1e8fd8ace9a7cb8bda'

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

Conflicts:
libavcodec/dcadata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dcadata.h