Merge branch 'egfx' of github.com:awakecoding/FreeRDP into egfx
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 6 Sep 2014 00:17:05 +0000 (20:17 -0400)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Sat, 6 Sep 2014 00:17:05 +0000 (20:17 -0400)
1  2 
libfreerdp/codec/h264.c

Simple merge