• Michael Niedermayer's avatar
    Merge commit 'c67b449b' · 35bb7490
    Michael Niedermayer authored
    * commit 'c67b449b':
      dsputil: Split bswap*_buf() off into a separate context
    
    Conflicts:
    	configure
    	libavcodec/4xm.c
    	libavcodec/ac3dec.c
    	libavcodec/ac3dec.h
    	libavcodec/apedec.c
    	libavcodec/eamad.c
    	libavcodec/flacenc.c
    	libavcodec/fraps.c
    	libavcodec/huffyuv.c
    	libavcodec/huffyuvdec.c
    	libavcodec/motionpixels.c
    	libavcodec/truemotion2.c
    	libavcodec/x86/Makefile
    	libavcodec/x86/dsputil_init.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    35bb7490
fraps.c 10.1 KB