]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '9e0b29911f1f167381a7dbdfca68bf417b8c767b':
  x86: dnxhdenc: Eliminate some unnecessary ifdefs

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

Simple merge