Merge commit '9e0b29911f1f167381a7dbdfca68bf417b8c767b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 20:33:14 +0000 (22:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 Jul 2014 20:33:24 +0000 (22:33 +0200)
commit097bf834bacd3b9a4e8826f4df8e3130d5685926
treead470aadc67a8879bc6e1e7798cf92e2eb0ec685
parent4b0fa45b842cb1a6721f4e83edd09400c35162fd
parent9e0b29911f1f167381a7dbdfca68bf417b8c767b
Merge commit '9e0b29911f1f167381a7dbdfca68bf417b8c767b'

* commit '9e0b29911f1f167381a7dbdfca68bf417b8c767b':
  x86: dnxhdenc: Eliminate some unnecessary ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/dnxhdenc_init.c