From patchwork Thu Dec 21 22:22:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 6895 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp1509292jad; Thu, 21 Dec 2017 14:23:01 -0800 (PST) X-Google-Smtp-Source: ACJfBovZxsZe7usYOgcAImtr/ACxVXyKro+v5LSPuNctMtDSnCjfgj+wcGbkEom38JmP+U72FTWg X-Received: by 10.28.106.16 with SMTP id f16mr285113wmc.58.1513894981878; Thu, 21 Dec 2017 14:23:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513894981; cv=none; d=google.com; s=arc-20160816; b=pNAUnPgAEKweuRjoiJLu6LRGMSMMrFWbQMWrwacxb1szlvjemkQr25qm7ueRoVogI4 blibEIEURfBizHBsZpp1xr6OjQQXYyat7xgWNBnPtIvopAM9f17LxPtQ8Zo0nC2v5QRC a4J4qTmFlWZodnPb8XfAb8nvDRbAEfNZeyxGrvxIROMfxF0R2rIR7Javv0n+9Row+mg2 PbWR+e8RpXCdBW0Y1BjP2lPAjKFWFS914UryH0Fi26MOgSSUKyjQx352nv5iGUZ4O0dF qDN/8572q5Xns/QHYnT34iz4mYcN+OsjGUozUr5oNtsIeJC4RHOrlVwq4KwIDjW0pewt pGRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=U67GHR3+ji7ARz0/kFA1SHTPW/1M2fTAepJB37F/Xk0=; b=HMS6zfy1atfzl6BniCI8H7G+rYKREpwWbwx8ZAZsNqGD3+QRn4frdY12GpTZi4eyK8 DczooesRj5yDgFhE9elRq3Bx7XurtRkg3l94aBtJzVaUEZOh87kph0O1pHUzQf5Ksnty 8tvlf4kstNBtgP2zIXq7nNEaREXFpAOJ64DWeWpgtlINUiIgy4JGPWKNLYcIOv29/XwL ceXEfxHNyAqV1A/+2lgo3SKBy3vKPoRoBOi8V1MhvJV+LM5rk5cEZpvuPbV+o3muCL+A azvoa6KCOTPVSmn4sxpSVfrtTgAwMsuYEM7QYyz9Oo3gnlfGpVzV+uCWw4L2qEskvwMV sxmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=H1+4VSGc; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g75si5416541wme.166.2017.12.21.14.23.01; Thu, 21 Dec 2017 14:23:01 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=H1+4VSGc; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A50F68075B; Fri, 22 Dec 2017 00:22:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A853B680642 for ; Fri, 22 Dec 2017 00:22:23 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id f140so18491060wmd.2 for ; Thu, 21 Dec 2017 14:22:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VgtSUUlqU+Uy3vYE9VK20wxEBQSVgXao+JkyGy5mNt4=; b=H1+4VSGcP5c++cCCqK+RId1OWNn/1SBqoI7taXKxVpgyhOHVI/IX5TkK5DV4vKM2ch uyA3Kneqwdffo05sjhUAYNoqK4PjKJHMTsr8nd6HPcAp0WPcTyr9XhvS20r0hvOzrIsI He9RggEK+gBmqB5VlD3LCMl7iel1OwhVleRE6aNM/oxvYaOnIbDRLkzi+RFwBQ0JP84w jgLKnPGYhIy5Knlti3tNoISsLLgSnZZil04Q8orleSfSjvtTYRg/CixNC83p6jwDDe05 veeGENmbScQJDeyqRO66ds/Ye9bhVXWoYgQxj1Q3deZUgyH4ApL1rv6dWm3kcwGTqr+G tvrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=VgtSUUlqU+Uy3vYE9VK20wxEBQSVgXao+JkyGy5mNt4=; b=MuwtXSRXNBqXxuv1KqHpw+z+U21ysA4rCLSuIRunyGnGgduXzHbMRF5OrsVgc449md 1pHYcj9BSLHeut3FUmBxoCkKlU5LnyKlyzTNyttWZsuktl3jtAo86qvw9E5HNC8RfS21 tI+QRjNhmy3CjpxABLPak0gmV87rovj0bNJRpACBxkzNpqAZxJY+IzZOKMjrXXR0jOi5 fyjxEsvQmMY0PZdlRlI8dV0RgVbOxk3DkzJ5F2GMzh7KuL11Zh6+mDIANPorz6kY3XKk VJMWNHL2HjaxljSYSakWEFJZSMcc3gRfqZwxch4ntkflKDbZTosNP5eIBZ833JnIuyQ1 K/Ng== X-Gm-Message-State: AKGB3mJQhDvf/sbmSgvcu7eWk4rHa1ylmJKMPtslwwKKzldpO72kb5KV io3lNJbFn59wtecpbpWu5/C4yw== X-Received: by 10.80.179.137 with SMTP id s9mr12340241edd.164.1513894954761; Thu, 21 Dec 2017 14:22:34 -0800 (PST) Received: from debian.speedport.ip (p2003006CCD4EDC713C06725800124D49.dip0.t-ipconnect.de. [2003:6c:cd4e:dc71:3c06:7258:12:4d49]) by smtp.googlemail.com with ESMTPSA id p47sm19834538edc.30.2017.12.21.14.22.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Dec 2017 14:22:33 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Dec 2017 23:22:22 +0100 Message-Id: <20171221222224.18577-3-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171221222224.18577-1-nfxjfg@googlemail.com> References: <20171221222224.18577-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH 3/5] ffplay: drop lock manager use X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Deprecated and useless. --- fftools/ffplay.c | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 10a917194d..9bfa3e6cea 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1284,7 +1284,6 @@ static void do_exit(VideoState *is) SDL_DestroyRenderer(renderer); if (window) SDL_DestroyWindow(window); - av_lockmgr_register(NULL); uninit_opts(); #if CONFIG_AVFILTER av_freep(&vfilters_list); @@ -3641,27 +3640,6 @@ void show_help_default(const char *opt, const char *arg) ); } -static int lockmgr(void **mtx, enum AVLockOp op) -{ - switch(op) { - case AV_LOCK_CREATE: - *mtx = SDL_CreateMutex(); - if(!*mtx) { - av_log(NULL, AV_LOG_FATAL, "SDL_CreateMutex(): %s\n", SDL_GetError()); - return 1; - } - return 0; - case AV_LOCK_OBTAIN: - return !!SDL_LockMutex(*mtx); - case AV_LOCK_RELEASE: - return !!SDL_UnlockMutex(*mtx); - case AV_LOCK_DESTROY: - SDL_DestroyMutex(*mtx); - return 0; - } - return 1; -} - /* Called from the main */ int main(int argc, char **argv) { @@ -3723,11 +3701,6 @@ int main(int argc, char **argv) SDL_EventState(SDL_SYSWMEVENT, SDL_IGNORE); SDL_EventState(SDL_USEREVENT, SDL_IGNORE); - if (av_lockmgr_register(lockmgr)) { - av_log(NULL, AV_LOG_FATAL, "Could not initialize lock manager!\n"); - do_exit(NULL); - } - av_init_packet(&flush_pkt); flush_pkt.data = (uint8_t *)&flush_pkt;