• Michael Niedermayer's avatar
    Merge commit '5169e688' · ba85bfab
    Michael Niedermayer authored
    * commit '5169e688':
      dsputil: Propagate bit depth information to all (sub)init functions
    
    Conflicts:
    	libavcodec/arm/dsputil_init_arm.c
    	libavcodec/arm/dsputil_init_armv5te.c
    	libavcodec/arm/dsputil_init_armv6.c
    	libavcodec/arm/dsputil_init_neon.c
    	libavcodec/dsputil.c
    	libavcodec/dsputil.h
    	libavcodec/ppc/dsputil_ppc.c
    	libavcodec/x86/dsputil_init.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    ba85bfab
dsputil_init_arm.c 3.38 KB