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

Merge pull request #2107 from akallabeth/fix_tsmf_wvc

Browse Source 
Minor TSMF fixes
This commit is contained in:
Martin Fleisz 2014-09-17 11:02:35 +02:00
commit 76835ece63
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c
View File

@ -508,10 +508,10 @@ static void tsmf_ffmpeg_free(ITSMFDecoder *decoder)
static BOOL initialized = FALSE;
#ifdef STATIC_CHANNELS
#define freerdp_tsmf_client_decoder_subsystem_entry ffmpeg_freerdp_tsmf_client_decoder_subsystem_entry
#define freerdp_tsmf_client_subsystem_entry ffmpeg_freerdp_tsmf_client_subsystem_entry
#endif
ITSMFDecoder *freerdp_tsmf_client_decoder_subsystem_entry(void)
ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void)
{
TSMFFFmpegDecoder *decoder;
if(!initialized)

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

@ -191,10 +191,10 @@ static BOOL tsmf_gstreamer_set_format(ITSMFDecoder *decoder, TS_AM_MEDIA_TYPE *m
{
case TSMF_SUB_TYPE_WVC1:
mdecoder->gst_caps = gst_caps_new_simple("video/x-wmv",
"bitrate", G_TYPE_UINT, media_type->BitRate,
"width", G_TYPE_INT, media_type->Width,
"height", G_TYPE_INT, media_type->Height,
"wmvversion", G_TYPE_INT, 3,
"format", G_TYPE_STRING, "WVC1",
NULL);
break;
case TSMF_SUB_TYPE_MP4S:
@ -748,10 +748,10 @@ BOOL tsmf_gstreamer_sync(ITSMFDecoder *decoder, void (*cb)(void *), void *stream
}
#ifdef STATIC_CHANNELS
#define freerdp_tsmf_client_decoder_subsystem_entry gstreamer_freerdp_tsmf_client_decoder_subsystem_entry
#define freerdp_tsmf_client_subsystem_entry gstreamer_freerdp_tsmf_client_subsystem_entry
#endif
ITSMFDecoder *freerdp_tsmf_client_decoder_subsystem_entry(void)
ITSMFDecoder *freerdp_tsmf_client_subsystem_entry(void)
{
TSMFGstreamerDecoder *decoder;