Merge commit '9ee9c679a7d444db223cf932e89cd39351f54f2d'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Jan 2014 13:35:44 +0000 (14:35 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 31 Jan 2014 13:36:35 +0000 (14:36 +0100)
commit8eaa66212c319c38394caaf7f232cf14c53c00c8
tree3decdaf452a0d43052bc79a07482a26a01ca376c
parentde17ccc774eab61300b098f2e151cfb9688cdd6d
parent9ee9c679a7d444db223cf932e89cd39351f54f2d
Merge commit '9ee9c679a7d444db223cf932e89cd39351f54f2d'

* commit '9ee9c679a7d444db223cf932e89cd39351f54f2d':
  x86: videodsp: Fix a bug in a %if statement where we used '%%' instead of '&&'.

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