From 79e5ff8d4b3a4ea91b96398e797340637d81ac9f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 24 Apr 2015 15:40:57 +0200 Subject: [PATCH] remove unused ffmpeg_lock --- src/main.c | 2 -- src/tvheadend.h | 1 - 2 files changed, 3 deletions(-) diff --git a/src/main.c b/src/main.c index 252cdf51a..6d4d75672 100644 --- a/src/main.c +++ b/src/main.c @@ -160,7 +160,6 @@ const tvh_caps_t tvheadend_capabilities[] = { pthread_mutex_t global_lock; pthread_mutex_t tasklet_lock; -pthread_mutex_t ffmpeg_lock; pthread_mutex_t fork_lock; pthread_mutex_t atomic_lock; @@ -549,7 +548,6 @@ main(int argc, char **argv) main_tid = pthread_self(); /* Setup global mutexes */ - pthread_mutex_init(&ffmpeg_lock, NULL); pthread_mutex_init(&fork_lock, NULL); pthread_mutex_init(&global_lock, NULL); pthread_mutex_init(&tasklet_lock, NULL); diff --git a/src/tvheadend.h b/src/tvheadend.h index 3548694c0..246a135dd 100644 --- a/src/tvheadend.h +++ b/src/tvheadend.h @@ -99,7 +99,6 @@ typedef struct str_list extern int tvheadend_running; extern pthread_mutex_t global_lock; -extern pthread_mutex_t ffmpeg_lock; extern pthread_mutex_t fork_lock; extern pthread_mutex_t atomic_lock; -- 2.47.3