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
bf4f672f
Commit
bf4f672f
authored
Feb 09, 2016
by
Simon Morlat
Browse files
add error message if mjpeg decoder is missing
parent
43de256e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
src/voip/videostream.c
src/voip/videostream.c
+6
-1
No files found.
src/voip/videostream.c
View file @
bf4f672f
...
...
@@ -562,7 +562,9 @@ static void configure_video_source(VideoStream *stream){
}
else
{
if
(
format
==
MS_MJPEG
){
stream
->
pixconv
=
ms_factory_create_filter
(
stream
->
ms
.
factory
,
MS_MJPEG_DEC_ID
);
if
(
stream
->
pixconv
==
NULL
){
ms_error
(
"Could not create mjpeg decoder, check your build options."
);
}
}
else
if
(
format
==
MS_PIX_FMT_UNKNOWN
){
stream
->
pixconv
=
ms_factory_create_decoder
(
stream
->
ms
.
factory
,
pf
.
fmt
->
encoding
);
}
else
{
...
...
@@ -1571,6 +1573,9 @@ void video_preview_start(VideoPreview *stream, MSWebCam *device){
ms_filter_call_method
(
stream
->
source
,
MS_FILTER_GET_VIDEO_SIZE
,
&
vsize
);
if
(
format
==
MS_MJPEG
){
stream
->
pixconv
=
ms_factory_create_filter
(
stream
->
ms
.
factory
,
MS_MJPEG_DEC_ID
);
if
(
stream
->
pixconv
==
NULL
){
ms_error
(
"Could not create mjpeg decoder, check your build options."
);
}
}
else
{
stream
->
pixconv
=
ms_factory_create_filter
(
stream
->
ms
.
factory
,
MS_PIX_CONV_ID
);
ms_filter_call_method
(
stream
->
pixconv
,
MS_FILTER_SET_PIX_FMT
,
&
format
);
...
...
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