Merge commit '3ecb82dd4110108244373f007710df4c2ae572b6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 May 2015 19:52:04 +0000 (21:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 May 2015 19:56:11 +0000 (21:56 +0200)
* commit '3ecb82dd4110108244373f007710df4c2ae572b6':
  dnxhddec: Fix pixel format change

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

Trivial merge