Merge commit '512f3ffe'
* commit '512f3ffe': dsputil: Split off HuffYUV encoding bits into their own context Conflicts: configure libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/huffyuv.h libavcodec/huffyuvenc.c libavcodec/pngenc.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
libavcodec/huffyuvencdsp.c
0 → 100644
libavcodec/huffyuvencdsp.h
0 → 100644
Please
register
or
sign in
to comment