From patchwork Sat Dec 23 23:51:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 6939 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp4096598jad; Sat, 23 Dec 2017 15:51:47 -0800 (PST) X-Google-Smtp-Source: ACJfBostkqUNEHdI1pJr6p293wBO9zkYm4ETdRDdENeGu1yNNapXoAl04wkq7tG+B++v+FQNJ6uX X-Received: by 10.223.131.99 with SMTP id 90mr12204512wrd.3.1514073107068; Sat, 23 Dec 2017 15:51:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514073107; cv=none; d=google.com; s=arc-20160816; b=AnbZzkzLSorBJrDvpkjdPPUBZWbD85Sc1gQ/8H5gsHuROqu9rdtjzxqVV/yjmcDDIk ebqdx+KUg4kp0+FI2cB5Ket6R+ns4D4f+9ygtJZ9N/tc6ugSPs8TweV4w1SpQv2lNqBK 6O8OT91zhYdLlylgY/kmppstNps6FFX3v3cHsnL94/qC/FUrDm6FJbnfOsG46fTteIr0 a1yNgf/VEA/5tpCXzCeijLJxDjJ6vyPiF3XelpBErnMp4maQBYygDI7QGaw0zk9i4OHW JBKJYnIIykmiKPeQ7gpAveVURs+teiKdTBvA8uuY8+5kUmUf/X8XigTKwDsEw2tkCrkE ldxg== 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=UKsC/Aalv3XLuKgqT4R80t98hSnhfmADiwHM1tc1RuC5zd8k1Ovx2A2M59UDHWIEGW JB9b7eHQ7nXMcaHBJSPWcBa77ecffrQAerDjjEikJiooJb+F4iMR5JcVcve0al23+vT5 /k1oq2VRWlXnI/E0GUnO4RbLY+vUB0nAb9zPbRwwxvcV9CSAmIpKoIcu3zxnEt1SFxeQ sByD3rVhExTb7QLfUwjdXU7QSypkGXsma47xvCwlhl50scLagvO3owx9/5Pj515mXwGv KDUSJhf4LaRtAV/XIkAZ9LwOsGVHX4HSKzxoXPbHS7xGn3TqypAb4KAMo4z9A0GHbrg4 Mdpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=KIXI6sbB; 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 u19si15976106wrb.546.2017.12.23.15.51.46; Sat, 23 Dec 2017 15:51:47 -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=KIXI6sbB; 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 A74576883B8; Sun, 24 Dec 2017 01:51:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D981668836C for ; Sun, 24 Dec 2017 01:51:11 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id i11so27354317wmf.4 for ; Sat, 23 Dec 2017 15:51:24 -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=KIXI6sbBeqoGH2uxRYSxS6rsMXlDPR/6hwnjB10g/O2jqv3ZdY3gpiaiI4sa/bOBEa k8d+V15kEfHJ33U0kuYTcYO4gRE3YTf+KEe6YSDN9IId7PkLmfCsR63rzoj/JTklVAAD FgtYXfbKW9rLKnFHiD2RX7ZZTwIvSsvnSNjEnBv+RKAE+1kSalmnsB92PP/LK8hoPxN4 4WNoqEQqS2evHJXaIfkyLes1sCv8uqXmN9aVagPnLJ3wwkK+mU3xu65NFfmb7EMFFVPM vwkID0c45WNURKxiYf3paO2IQTxIbSzGlA8VEelhZwTA4J5mf7WRqDBj+K5OBNjVbf3l okIQ== 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=QejX8CZngll6fqrHUOkJytZ9knDuG/zX/EOeQRu4H7pVKAwynTJvvdT5TM9Vx9cTpz nWlISRLnVwuIYHlOvtUmZ7pLh3ccq8cR/zMnu2JxwawNyjdJzlWhDjpgPOw0vhTO1OQD yjKuX2Dy77hAbYzih6qc3Lv8OJxLLMUaeICEOnwfmYJUS5pl70iQI0YHlauGK3jzwLBf 5iCWRIRtg4T3sgaeaJ+2Mc4qCVLMwyz9N8Up5YThcAlxXDaQ3w7BVIehb9pCzkiIMM7R g67HQOtC3QWW4wjSWe8qoqZJmqqdPwo9Pv0Ixk0S32Zs9cl7J2VQxb0bvQTe3mgUkMOY S1QQ== X-Gm-Message-State: AKGB3mJ+XiAmDcVM/wWps/Wxe209ux+hHAzKNHUg8mdUtLnYhihtMwcc Dj0d1quTsLo8iJw3NFTwQU38dw== X-Received: by 10.28.155.1 with SMTP id d1mr17570698wme.68.1514073083598; Sat, 23 Dec 2017 15:51:23 -0800 (PST) Received: from debian.speedport.ip (p2003006CCD4EDC353C06725800124D49.dip0.t-ipconnect.de. [2003:6c:cd4e:dc35:3c06:7258:12:4d49]) by smtp.googlemail.com with ESMTPSA id i66sm7743406wmf.3.2017.12.23.15.51.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 23 Dec 2017 15:51:22 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Sun, 24 Dec 2017 00:51:18 +0100 Message-Id: <20171223235120.31578-3-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171223235120.31578-1-nfxjfg@googlemail.com> References: <20171221222224.18577-1-nfxjfg@googlemail.com> <20171223235120.31578-1-nfxjfg@googlemail.com> Subject: [FFmpeg-devel] [PATCH v3 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;