This is an automatic generated email to let you know that the following patch 
were queued at the 
http://git.linuxtv.org/cgit.cgi/tvtime.git tree:

Subject: Fix crash when no v4l capture devices are found
Author:  Hans de Goede <[email protected]>
Date:    Tue Mar 29 22:01:20 2016 +0200

Signed-off-by: Hans de Goede <[email protected]>

 src/mixer.c  | 2 +-
 src/tvtime.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

---

http://git.linuxtv.org/cgit.cgi/tvtime.git/commit/?id=73aaa27fd8a8e6481985211b819d1b7d0662c0cb
diff --git a/src/mixer.c b/src/mixer.c
index 34020d03da9d..ab3a61f5e7e8 100644
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -127,7 +127,7 @@ void mixer_init( config_t *cfg, const char *v4ldev )
     mixer_capdev = config_get_alsa_inputdev( mixer_cfg );
 
 #ifdef __linux__ /* Because this depends on get_media_devices.c */
-    if( !strcmp( mixer_capdev, "auto" ) ) {
+    if( !strcmp( mixer_capdev, "auto" ) && v4ldev ) {
        const char *p;
        void *md;
 
diff --git a/src/tvtime.c b/src/tvtime.c
index cddf9734e2d4..438664c75e75 100644
--- a/src/tvtime.c
+++ b/src/tvtime.c
@@ -1416,7 +1416,7 @@ int tvtime_main( rtctimer_t *rtctimer, int read_stdin, 
int realtime,
     secondlastframe = lastframe = blueframe;
 
     /* Init the mixer (and alsa digital loopback) */
-    mixer_init( ct, videoinput_get_v4ldev( vidin ) );
+    mixer_init( ct, vidin ? videoinput_get_v4ldev( vidin ) : NULL );
 
     /* Setup OSD stuff. */
     pixel_aspect = ( (double) width ) /

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to