Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
a457709d
Commit
a457709d
authored
Sep 14, 2012
by
Ghislain MARY
Browse files
Split of alldescs.h for windows platform.
parent
84dfa4d6
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
42 additions
and
32 deletions
+42
-32
build/win32-novideo/Makefile.am
build/win32-novideo/Makefile.am
+1
-2
build/win32-novideo/basedescs.h
build/win32-novideo/basedescs.h
+9
-0
build/win32-novideo/voipdescs.h
build/win32-novideo/voipdescs.h
+1
-6
build/win32native/Makefile.am
build/win32native/Makefile.am
+1
-2
build/wince/Makefile.am
build/wince/Makefile.am
+1
-2
build/wince/basedescs.h
build/wince/basedescs.h
+11
-0
build/wince/voipdescs.h
build/wince/voipdescs.h
+1
-8
build/winmob/Makefile.am
build/winmob/Makefile.am
+1
-2
build/winmob/basedescs.h
build/winmob/basedescs.h
+11
-0
build/winmob/voipdescs.h
build/winmob/voipdescs.h
+1
-8
src/.gitignore
src/.gitignore
+4
-2
No files found.
build/win32-novideo/Makefile.am
View file @
a457709d
EXTRA_DIST
=
alldescs.h mediastreamer2.vcproj mediastream.vcproj mediastreamer2.def
EXTRA_DIST
=
basedescs.h voipdescs.h mediastreamer2.vcproj mediastream.vcproj mediastreamer2.def
build/win32-novideo/basedescs.h
0 → 100755
View file @
a457709d
#include "mediastreamer2/msfilter.h"
extern
MSFilterDesc
ms_tee_desc
;
extern
MSFilterDesc
ms_join_desc
;
MSFilterDesc
*
ms_base_filter_descs
[]
=
{
&
ms_tee_desc
,
&
ms_join_desc
,
NULL
};
build/win32-novideo/
all
descs.h
→
build/win32-novideo/
voip
descs.h
View file @
a457709d
...
...
@@ -14,7 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
extern
MSFilterDesc
ms_gsm_dec_desc
;
extern
MSFilterDesc
ms_gsm_enc_desc
;
extern
MSFilterDesc
ms_speex_ec_desc
;
extern
MSFilterDesc
ms_tee_desc
;
extern
MSFilterDesc
ms_conf_desc
;
//extern MSFilterDesc alsa_write_desc;
//extern MSFilterDesc alsa_read_desc;
...
...
@@ -26,11 +25,10 @@ extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc ms_sdl_out_desc;
//extern MSFilterDesc ms_h263_enc_desc;
//extern MSFilterDesc ms_h263_dec_desc;
extern
MSFilterDesc
ms_join_desc
;
extern
MSFilterDesc
ms_resample_desc
;
extern
MSFilterDesc
ms_volume_desc
;
extern
MSFilterDesc
ms_equalizer_desc
;
MSFilterDesc
*
ms_filter_descs
[]
=
{
MSFilterDesc
*
ms_
voip_
filter_descs
[]
=
{
&
ms_alaw_dec_desc
,
&
ms_alaw_enc_desc
,
&
ms_ulaw_dec_desc
,
...
...
@@ -45,7 +43,6 @@ MSFilterDesc * ms_filter_descs[]={
&
ms_gsm_dec_desc
,
&
ms_gsm_enc_desc
,
&
ms_speex_ec_desc
,
&
ms_tee_desc
,
&
ms_conf_desc
,
//&alsa_write_desc,
//&alsa_read_desc,
...
...
@@ -57,7 +54,6 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_sdl_out_desc,
//&ms_h263_enc_desc,
//&ms_h263_dec_desc,
&
ms_join_desc
,
#ifndef DISABLE_RESAMPLE
&
ms_resample_desc
,
#endif
...
...
@@ -65,4 +61,3 @@ MSFilterDesc * ms_filter_descs[]={
&
ms_equalizer_desc
,
NULL
};
build/win32native/Makefile.am
View file @
a457709d
SUBDIRS
=
mediastream
EXTRA_DIST
=
alldescs.h mediastreamer2.sln mediastreamer2.vcproj videodisplay.vcproj
EXTRA_DIST
=
basedescs.h voipdescs.h mediastreamer2.sln mediastreamer2.vcproj videodisplay.vcproj
build/wince/Makefile.am
View file @
a457709d
EXTRA_DIST
=
alldescs.h mediastreamer2.vcproj mediastreamer2.def
EXTRA_DIST
=
basedescs.h voipdescs.h mediastreamer2.vcproj mediastreamer2.def
build/wince/basedescs.h
0 → 100644
View file @
a457709d
#include "mediastreamer2/msfilter.h"
extern
MSFilterDesc
ms_tee_desc
;
extern
MSFilterDesc
ms_join_desc
;
extern
MSFilterDesc
ms_void_sink_desc
;
MSFilterDesc
*
ms_base_filter_descs
[]
=
{
&
ms_tee_desc
,
&
ms_join_desc
,
&
ms_void_sink_desc
,
NULL
};
build/wince/
all
descs.h
→
build/wince/
voip
descs.h
View file @
a457709d
...
...
@@ -14,7 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
//extern MSFilterDesc ms_gsm_dec_desc;
//extern MSFilterDesc ms_gsm_enc_desc;
extern
MSFilterDesc
ms_speex_ec_desc
;
extern
MSFilterDesc
ms_tee_desc
;
extern
MSFilterDesc
ms_conf_desc
;
//extern MSFilterDesc alsa_write_desc;
//extern MSFilterDesc alsa_read_desc;
...
...
@@ -26,11 +25,9 @@ extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc ms_sdl_out_desc;
//extern MSFilterDesc ms_h263_enc_desc;
//extern MSFilterDesc ms_h263_dec_desc;
extern
MSFilterDesc
ms_join_desc
;
extern
MSFilterDesc
ms_resample_desc
;
extern
MSFilterDesc
ms_volume_desc
;
extern
MSFilterDesc
ms_void_sink_desc
;
MSFilterDesc
*
ms_filter_descs
[]
=
{
MSFilterDesc
*
ms_voip_filter_descs
[]
=
{
&
ms_alaw_dec_desc
,
&
ms_alaw_enc_desc
,
&
ms_ulaw_dec_desc
,
...
...
@@ -45,7 +42,6 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_gsm_dec_desc,
//&ms_gsm_enc_desc,
&
ms_speex_ec_desc
,
&
ms_tee_desc
,
&
ms_conf_desc
,
//&alsa_write_desc,
//&alsa_read_desc,
...
...
@@ -57,10 +53,7 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_sdl_out_desc,
//&ms_h263_enc_desc,
//&ms_h263_dec_desc,
&
ms_join_desc
,
&
ms_resample_desc
,
&
ms_volume_desc
,
&
ms_void_sink_desc
,
NULL
};
build/winmob/Makefile.am
View file @
a457709d
EXTRA_DIST
=
alldescs.h mediastreamer2.vcproj mediastreamer2.sln mediastreamer2.def
EXTRA_DIST
=
basedescs.h voipdescs.h mediastreamer2.vcproj mediastreamer2.sln mediastreamer2.def
build/winmob/basedescs.h
0 → 100644
View file @
a457709d
#include "mediastreamer2/msfilter.h"
extern
MSFilterDesc
ms_tee_desc
;
extern
MSFilterDesc
ms_join_desc
;
extern
MSFilterDesc
ms_void_sink_desc
;
MSFilterDesc
*
ms_base_filter_descs
[]
=
{
&
ms_tee_desc
,
&
ms_join_desc
,
&
ms_void_sink_desc
,
NULL
};
build/winmob/
all
descs.h
→
build/winmob/
voip
descs.h
View file @
a457709d
...
...
@@ -14,7 +14,6 @@ extern MSFilterDesc ms_speex_enc_desc;
//extern MSFilterDesc ms_gsm_dec_desc;
//extern MSFilterDesc ms_gsm_enc_desc;
extern
MSFilterDesc
ms_speex_ec_desc
;
extern
MSFilterDesc
ms_tee_desc
;
extern
MSFilterDesc
ms_conf_desc
;
//extern MSFilterDesc alsa_write_desc;
//extern MSFilterDesc alsa_read_desc;
...
...
@@ -26,11 +25,9 @@ extern MSFilterDesc ms_conf_desc;
//extern MSFilterDesc ms_sdl_out_desc;
//extern MSFilterDesc ms_h263_enc_desc;
//extern MSFilterDesc ms_h263_dec_desc;
extern
MSFilterDesc
ms_join_desc
;
extern
MSFilterDesc
ms_resample_desc
;
extern
MSFilterDesc
ms_volume_desc
;
extern
MSFilterDesc
ms_void_sink_desc
;
MSFilterDesc
*
ms_filter_descs
[]
=
{
MSFilterDesc
*
ms_voip_filter_descs
[]
=
{
&
ms_alaw_dec_desc
,
&
ms_alaw_enc_desc
,
&
ms_ulaw_dec_desc
,
...
...
@@ -45,7 +42,6 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_gsm_dec_desc,
//&ms_gsm_enc_desc,
&
ms_speex_ec_desc
,
&
ms_tee_desc
,
&
ms_conf_desc
,
//&alsa_write_desc,
//&alsa_read_desc,
...
...
@@ -57,10 +53,7 @@ MSFilterDesc * ms_filter_descs[]={
//&ms_sdl_out_desc,
//&ms_h263_enc_desc,
//&ms_h263_dec_desc,
&
ms_join_desc
,
&
ms_resample_desc
,
&
ms_volume_desc
,
&
ms_void_sink_desc
,
NULL
};
src/.gitignore
View file @
a457709d
...
...
@@ -4,5 +4,7 @@ Makefile
.deps
*.la
*.lo
alldescs.h
filterdescs.txt
basedescs.h
voipdescs.h
basedescs.txt
voipdescs.txt
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment