1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
FFmpeg/libavcodec
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-27 20:42:50 +02:00
2014-05-17 15:51:49 +02:00
2014-05-11 20:06:45 +02:00
2014-05-17 15:51:49 +02:00
2014-04-27 14:50:14 +02:00
2014-04-28 00:22:38 +02:00
2014-05-25 03:45:10 +02:00
2014-05-25 03:45:10 +02:00
2014-05-17 01:14:51 +02:00
2014-05-25 03:45:10 +02:00
2014-05-06 18:23:36 +02:00
2014-05-06 18:23:36 +02:00
2014-05-17 15:51:49 +02:00
2014-05-25 05:19:09 +02:00
2014-05-09 16:07:15 +02:00
2014-05-25 19:25:10 +02:00
2014-04-27 13:03:28 +02:00
2014-04-30 17:41:31 +02:00
2014-04-25 15:04:42 +02:00
2014-05-12 03:27:04 +02:00
2014-05-27 20:42:50 +02:00
2014-05-03 18:25:17 +02:00