Commit Graph

12 Commits

Author SHA1 Message Date
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
Martin Pulec
5c29ea3a2f GPUJPEG updated to 88457039
* should fix all remaining CUDA 5 problems
2013-01-17 12:48:41 +01:00
Martin Pulec
4131c4b131 Merge branch 'master' into trunk
Conflicts:
	configure.ac
	src/audio/audio.c
	src/rtp/decoders.c
	src/video_codec.c
	src/video_compress.c
	src/video_compress/fastdxt.c
	src/video_decompress.c
	src/video_decompress/dxt_glsl.c
2013-01-15 10:05:56 +01:00
Martin Pulec
e6527bd188 updated JPEG to 2d45e144 (CUDA 5 fix) 2012-12-18 13:41:26 +01:00
Martin Pulec
25099eb14d Added JPEG->DXT1 transcoder 2012-09-27 16:14:44 +02:00
Martin Pulec
953637d906 GPUJPEG UltraGrid fixes 2012-09-27 16:13:52 +02:00
Martin Pulec
b463db7d52 another build fixes 2012-08-17 13:02:36 +02:00
Martin Pulec
05515f83af Missing extension 2012-08-17 10:35:12 +02:00
Martin Pulec
749a8a6a96 Updated to GPUJPEG 51bc564e 2012-08-15 16:04:05 +02:00
Martin Pulec
7e8b957a34 some build fixes 2012-08-15 14:59:37 +02:00
Martin Pulec
81b27709af GPUJPEG: invoke libtoolize for parent 2012-08-15 14:59:37 +02:00
Martin Pulec
02c370ac8b Updated GPUJPEG to 2d45e144 2012-08-15 14:59:37 +02:00