Commit Graph

55 Commits

Author SHA1 Message Date
Mike McDonald
07351ddff4 Fixed issue with last merge. 2014-07-04 03:52:05 -04:00
Mike McDonald
0ddd52a7db Merged branch 'egfx' of github.com:awakecoding/FreeRDP into egfx 2014-07-04 03:16:55 -04:00
Mike McDonald
0a13972c7d Added #ifdef WITH_OPENH264 ... #endif to appropriate places in the code. 2014-07-04 03:06:50 -04:00
Marc-André Moreau
bde954107d Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
Conflicts:
	client/X11/xf_gfx.c
2014-07-03 12:03:39 -04:00
Mike McDonald
4d3d78c487 Initial implementation of H.264 decoder for MS-RDPEGFX 2014-07-01 23:28:09 -04:00