Michael Niedermayer
e2abc0d5ca
Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'
* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
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: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 23:16:06 +02:00
..
2014-05-19 22:10:01 +02:00
2014-05-27 23:16:06 +02:00
2014-03-22 23:17:03 +01:00
2014-04-05 19:10:00 +02:00
2014-04-05 19:10:00 +02:00
2014-03-22 23:17:03 +01:00
2014-03-22 23:17:03 +01:00
2014-03-22 23:17:03 +01:00
2014-05-27 23:16:06 +02:00
2014-05-27 08:52:34 -07:00
2014-04-05 19:10:00 +02:00
2014-04-05 19:10:00 +02:00
2014-04-05 19:10:00 +02:00
2014-04-04 14:46:10 +02:00