From 0ddea5afa30e040d7f3794d5761ed75b588cbec6 Mon Sep 17 00:00:00 2001 From: Alam Arias Date: Sun, 17 Jun 2012 09:51:37 -0400 Subject: [PATCH 1/4] ffmpeg: avcodec_init() is been deprecated (and removed) --- channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c index 4210fa0e1..903f64320 100644 --- a/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c +++ b/channels/drdynvc/tsmf/ffmpeg/tsmf_ffmpeg.c @@ -499,7 +499,6 @@ TSMFDecoderEntry(void) if (!initialized) { - avcodec_init(); avcodec_register_all(); initialized = true; } From 477b90c439d9d69968196c98cac7ff3f7a81ecab Mon Sep 17 00:00:00 2001 From: Alam Arias Date: Sun, 17 Jun 2012 09:55:51 -0400 Subject: [PATCH 2/4] gstreamer: use PRIu64 marco for uint64_t --- channels/drdynvc/tsmf/gstreamer/tsmf_gstreamer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/channels/drdynvc/tsmf/gstreamer/tsmf_gstreamer.c b/channels/drdynvc/tsmf/gstreamer/tsmf_gstreamer.c index bb0f9ad62..7243dcd33 100644 --- a/channels/drdynvc/tsmf/gstreamer/tsmf_gstreamer.c +++ b/channels/drdynvc/tsmf/gstreamer/tsmf_gstreamer.c @@ -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) { From 48ad5feb0a6ad831d863f89ed74b443021e54303 Mon Sep 17 00:00:00 2001 From: "Ying-Chun Liu (PaulLiu)" Date: Tue, 19 Jun 2012 14:49:53 +0800 Subject: [PATCH 3/4] Init extensions in pre_connect stage. Due to the client is parsing the args in pre_connect, we should start loading the extensions after client parsing the args. Signed-off-by: Ying-Chun Liu (PaulLiu) --- libfreerdp-core/freerdp.c | 5 +++-- libfreerdp-core/rdp.c | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libfreerdp-core/freerdp.c b/libfreerdp-core/freerdp.c index 90dadf646..23fe98361 100644 --- a/libfreerdp-core/freerdp.c +++ b/libfreerdp-core/freerdp.c @@ -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){ diff --git a/libfreerdp-core/rdp.c b/libfreerdp-core/rdp.c index 2170816fb..82788d5cf 100644 --- a/libfreerdp-core/rdp.c +++ b/libfreerdp-core/rdp.c @@ -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); From 6c3af717c56a2386b693a374edbd296168f0fcfc Mon Sep 17 00:00:00 2001 From: Dorian Johnson <2012@dorianj.net> Date: Tue, 19 Jun 2012 12:31:35 -0500 Subject: [PATCH 4/4] winpr: fix semaphore_t definition --- winpr/handle/handle.c | 2 +- winpr/synch/semaphore.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winpr/handle/handle.c b/winpr/handle/handle.c index 098f2e331..23ac25566 100644 --- a/winpr/handle/handle.c +++ b/winpr/handle/handle.c @@ -27,7 +27,7 @@ #include #include #include -#define winpr_sem_t semaphore_td +#define winpr_sem_t semaphore_t #else #include #include diff --git a/winpr/synch/semaphore.c b/winpr/synch/semaphore.c index 93175148a..867364a1e 100644 --- a/winpr/synch/semaphore.c +++ b/winpr/synch/semaphore.c @@ -27,7 +27,7 @@ #include #include #include -#define winpr_sem_t semaphore_td +#define winpr_sem_t semaphore_t #else #include #include