Merge commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Sep 2014 09:50:41 +0000 (11:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Sep 2014 09:51:34 +0000 (11:51 +0200)
* commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4':
  dca: Remove some commented-out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dcadec.c

Simple merge