Merge commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 03:02:41 +0000 (04:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 19 Nov 2013 03:09:03 +0000 (04:09 +0100)
* commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9':
  dcadec: simplify an expression

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

Simple merge