• Michael Niedermayer's avatar
    Merge commit '0d439fbe' · e2abc0d5
    Michael Niedermayer authored
    * commit '0d439fbe':
      dsputil: Split off HuffYUV decoding bits into their own context
    
    Conflicts:
    	configure
    	libavcodec/dsputil.c
    	libavcodec/dsputil.h
    	libavcodec/huffyuv.h
    	libavcodec/huffyuvdec.c
    	libavcodec/lagarith.c
    	libavcodec/vble.c
    	libavcodec/x86/Makefile
    	libavcodec/x86/dsputil.asm
    	libavcodec/x86/dsputil_init.c
    	libavcodec/x86/dsputil_mmx.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    e2abc0d5
vble.c 6.26 KB