Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 22:03:59 +0000 (00:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 May 2014 22:03:59 +0000 (00:03 +0200)
commit48a691630833d6b12905475b6bf39fef285872a9
treeaaeb0c4d73c6c0c72606aae3c4a1de62b17dc6e7
parente2abc0d5cacc22aa900de8ac26160ea1b786a7b5
parent512f3ffe9b4bb86767c2b1176554407c75fe1a5c
Merge commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'

* commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c':
  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>
15 files changed:
configure
libavcodec/Makefile
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvenc.c
libavcodec/huffyuvencdsp.c
libavcodec/huffyuvencdsp.h
libavcodec/pngenc.c
libavcodec/utvideo.h
libavcodec/utvideoenc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/huffyuvdsp_init.c
libavcodec/x86/huffyuvencdsp_mmx.c