mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:FreeRDP/FreeRDP into winpr

Browse Source
This commit is contained in:
Marc-André Moreau 2012-06-21 14:30:35 -04:00
commit 274ee51a7a
6 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c
View File

@ -499,7 +499,6 @@ TSMFDecoderEntry(void)
if (!initialized)
{
avcodec_init();
avcodec_register_all();
initialized = true;
}

6
channels/drdynvc/tsmf/gstreamer/tsmf_gstreamer.c
View File

@ -1186,7 +1186,7 @@ static boolean tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const uint8 * dat
if (fout)
{
fprintf(fout, "%llu\n", start_time);
fprintf(fout, "%"PRIu64"\n", start_time);
fclose(fout);
}
@ -1212,7 +1212,7 @@ static boolean tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const uint8 * dat
if (fin)
{
uint64 AStartTime = 0;
fscanf(fin, "%llu", &AStartTime);
fscanf(fin, "%"PRIu64, &AStartTime);
fclose(fin);
if (start_time > AStartTime)
{
@ -1246,7 +1246,7 @@ static boolean tsmf_gstreamer_decodeEx(ITSMFDecoder * decoder, const uint8 * dat
if (fin)
{
uint64 VStartTime = 0;
fscanf(fin, "%llu", &VStartTime);
fscanf(fin, "%"PRIu64, &VStartTime);
fclose(fin);
if (start_time > VStartTime)
{

5
libfreerdp-core/freerdp.c
View File

@ -52,10 +52,11 @@ boolean freerdp_connect(freerdp* instance)
rdp = instance->context->rdp;
extension_pre_connect(rdp->extension);
IFCALLRET(instance->PreConnect, status, instance);
rdp->extension = extension_new(instance);
extension_pre_connect(rdp->extension);
if (status != true)
{
if(!connectErrorCode){

1
libfreerdp-core/rdp.c
View File

@ -916,7 +916,6 @@ rdpRdp* rdp_new(freerdp* instance)
if (instance != NULL)
instance->settings = rdp->settings;
rdp->extension = extension_new(instance);
rdp->transport = transport_new(rdp->settings);
rdp->license = license_new(rdp);
rdp->input = input_new(rdp);

2
winpr/handle/handle.c
View File

@ -27,7 +27,7 @@
#include <mach/mach.h>
#include <mach/semaphore.h>
#include <mach/task.h>
#define winpr_sem_t semaphore_td
#define winpr_sem_t semaphore_t
#else
#include <pthread.h>
#include <semaphore.h>

2
winpr/synch/semaphore.c
View File

@ -27,7 +27,7 @@
#include <mach/mach.h>
#include <mach/semaphore.h>
#include <mach/task.h>
#define winpr_sem_t semaphore_td
#define winpr_sem_t semaphore_t
#else
#include <pthread.h>
#include <semaphore.h>