Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
mediastreamer2
Commits
6250d36e
Commit
6250d36e
authored
Nov 17, 2011
by
jehan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
disable MS_SND_CARD_CAP_CAPTURE for aqsound
move vp8 mime type from VP8-DRAFT-0-3-2 to VP8
parent
a9c4b3e4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
src/Makefile.am
src/Makefile.am
+1
-1
src/aqsnd.c
src/aqsnd.c
+1
-1
src/vp8.c
src/vp8.c
+4
-4
No files found.
src/Makefile.am
View file @
6250d36e
...
...
@@ -188,7 +188,7 @@ endif
alldescs.h
:
Makefile
.am
$(libmediastreamer_la_SOURCES)
alldescs.h
:
Makefile $(libmediastreamer_la_SOURCES)
builddir
=
`
pwd
`
&&
cd
$(srcdir)
&&
\
awk
'BEGIN { FS="[()]" ; }; /^\t*MS_FILTER_DESC_EXPORT/{ printf("%s\n", $$2) } '
>
$$
builddir/filterdescs.txt
$(libmediastreamer_la_SOURCES)
&&
\
awk
'BEGIN { print("#include \"mediastreamer2/msfilter.h\"\n") } { printf("extern MSFilterDesc %s;\n",$$1) } '
$$
builddir/filterdescs.txt
>
$$
builddir/
$@
&&
\
...
...
src/aqsnd.c
View file @
6250d36e
...
...
@@ -260,7 +260,7 @@ static void aqcard_detect(MSSndCardManager * m)
memset
(
&
deviceFormat
,
0
,
sizeof
(
AudioStreamBasicDescription
));
MSSndCard
*
card
=
aq_card_new
(
"Audio Queue Device"
,
NULL
,
&
deviceFormat
,
&
deviceFormat
,
MS_SND_CARD_CAP_PLAYBACK
|
MS_SND_CARD_CAP_CAPTURE
);
&
deviceFormat
,
MS_SND_CARD_CAP_PLAYBACK
/*
|MS_SND_CARD_CAP_CAPTURE
*/
);
ms_snd_card_manager_add_card
(
m
,
card
);
#else
OSStatus
err
;
...
...
src/vp8.c
View file @
6250d36e
...
...
@@ -349,7 +349,7 @@ MSFilterDesc ms_vp8_enc_desc={
"MSVp8Enc"
,
N_
(
"A video VP8 encoder using libvpx library."
),
MS_FILTER_ENCODER
,
"VP8
-DRAFT-0-3-2
"
,
"VP8"
,
1
,
/*MS_YUV420P is assumed on this input */
1
,
enc_init
,
...
...
@@ -365,7 +365,7 @@ MSFilterDesc ms_vp8_enc_desc={
.
name
=
"MSVp8Enc"
,
.
text
=
N_
(
"A video VP8 encoder using libvpx library."
),
.
category
=
MS_FILTER_ENCODER
,
.
enc_fmt
=
"VP8
-DRAFT-0-3-2
"
,
.
enc_fmt
=
"VP8"
,
.
ninputs
=
1
,
/*MS_YUV420P is assumed on this input */
.
noutputs
=
1
,
.
init
=
enc_init
,
...
...
@@ -597,7 +597,7 @@ MSFilterDesc ms_vp8_dec_desc={
"MSVp8Dec"
,
"A VP8 decoder using libvpx library"
,
MS_FILTER_DECODER
,
"VP8
-DRAFT-0-3-2
"
,
"VP8"
,
1
,
1
,
dec_init
,
...
...
@@ -613,7 +613,7 @@ MSFilterDesc ms_vp8_dec_desc={
.
name
=
"MSVp8Dec"
,
.
text
=
"A VP8 decoder using libvpx library"
,
.
category
=
MS_FILTER_DECODER
,
.
enc_fmt
=
"VP8
-DRAFT-0-3-2
"
,
.
enc_fmt
=
"VP8"
,
.
ninputs
=
1
,
.
noutputs
=
1
,
.
init
=
dec_init
,
...
...
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