Martin Pulec 5ee0985f91 Merge branch 'master' into trunk ...

Conflicts:
	src/video_codec.c
	src/video_decompress.c

2013-01-23 09:57:00 +01:00

..

gpujpeg_colorspace.h

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_common.c

Added JPEG->DXT1 transcoder

2012-09-27 16:14:44 +02:00

gpujpeg_dct_cpu.c

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_dct_cpu.h

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_dct_gpu.cu

GPUJPEG updated to 88457039

2013-01-17 12:48:41 +01:00

gpujpeg_dct_gpu.h

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_decoder.c

GPUJPEG UltraGrid fixes

2012-09-27 16:13:52 +02:00

gpujpeg_encoder.c

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_huffman_cpu_decoder.c

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_huffman_cpu_decoder.h

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_huffman_cpu_encoder.c

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_huffman_cpu_encoder.h

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_huffman_gpu_decoder.cu

GPUJPEG updated to 88457039

2013-01-17 12:48:41 +01:00

gpujpeg_huffman_gpu_decoder.h

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_huffman_gpu_encoder.cu

updated JPEG to 2d45e144 (CUDA 5 fix)

2012-12-18 13:41:26 +01:00

gpujpeg_huffman_gpu_encoder.h

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_preprocessor.cu

Updated to GPUJPEG 51bc564e

2012-08-15 16:04:05 +02:00

gpujpeg_preprocessor.h

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_reader.c

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_table.c

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

gpujpeg_writer.c

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

main.c

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00

Makefile.bkp

Updated GPUJPEG to 2d45e144

2012-08-15 14:59:37 +02:00