projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
39a0267
)
rpicamsrc: Don't destroy the camera component on startup error
author
Jan Schmidt
<jan@centricular.com>
Wed, 20 Jun 2018 15:36:42 +0000
(15:36 +0000)
committer
Tim-Philipp Müller
<tim@centricular.com>
Fri, 10 Jul 2020 15:46:23 +0000
(16:46 +0100)
Just disable the camera component when it fails to start. The
most common reason is that the camera device is already in use,
and if we just disable the mmal component correct cleanup
will happen later
sys/rpicamsrc/RaspiCapture.c
patch
|
blob
|
history
diff --git
a/sys/rpicamsrc/RaspiCapture.c
b/sys/rpicamsrc/RaspiCapture.c
index
cae5cf6
..
a7d72a0
100644
(file)
--- a/
sys/rpicamsrc/RaspiCapture.c
+++ b/
sys/rpicamsrc/RaspiCapture.c
@@
-1268,9
+1268,8
@@
raspi_capture_set_format_and_start(RASPIVID_STATE *state)
return status;
error:
-
if (camera)
- mmal_component_d
estroy
(camera);
+ mmal_component_d
isable
(camera);
return status;
}