From patchwork Mon Aug 5 07:16:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 14239 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 18363447FEE for ; Mon, 5 Aug 2019 10:17:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F377F68A89E; Mon, 5 Aug 2019 10:17:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C8F268A742 for ; Mon, 5 Aug 2019 10:17:08 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id p74so73600955wme.4 for ; Mon, 05 Aug 2019 00:17:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=iu+z8moR8TETxsCdrz258UU7Fj3hOw7AOOVx4WLBejw=; b=YnjiPdWanuxUTfQfwjE6dNcpxaEBAzeY9R97W44LMDHfXPIrnb9AWbe0V5oFADkjED WGftQsug2k62e9PVWKgHUuv8/vK9dnDhbSkSy5gczedlNgOBv5upG/cMRyyHPqFUMcgM b70nJke9lreU++XYUae/LSiIsjiPX+7f5CHRXEOnzM62T7EjC3y9+oLIixNAe2epVTYw p7eZ6/DKRJZvV7ZlPpAwsF25eJyri6rpMO3GTNOsShBgyoAUgwByfJwSfNSpwQeUrXWK +fA05HwANnIaKch8gQoh9L+5Ac7HeDmak9lxfnyTMp267LBItfYTuQ0SCVZG9qoTnNq3 g1Tg== 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:mime-version :content-transfer-encoding; bh=iu+z8moR8TETxsCdrz258UU7Fj3hOw7AOOVx4WLBejw=; b=GgsnrG4iOBmuAZXnaZnjHp6HPtJ5jl2Txq6hM4RhWSeYTrIdTpkMNms/HYbrhx4wQD QUuKlXlZ5m0bHfUHrl6PNUC9i1qOnjYWZ3ti85615aLTHLWThkPfBR+zRdgYaiPo8SHS 4AR77zTuOop/6fUFzyCcWk5jwl2ZXNHFRggulANOaZoS+mWZSrmEF1aQUXfNjLW08WrT ncpAhRp2ZLCw3rjBsuLQmMw1ODD/1EdhvWeCXpJD8QveU+wNrqAeP50mHd9kR1Kvkus4 JQU+UnhjZoJnLmkqDKNp2jWOxgRZC/UF7A6nLeS3djf+3eehCOnimSf/8r4QtNF8FOqY +YwQ== X-Gm-Message-State: APjAAAUTEa8CszaItCfVJwjySFLX/16iJZZnqH6GuLDw6OpiusL3gL64 Y1nMU0A6rOCd/ubYIxFjsacMd5NQ X-Google-Smtp-Source: APXvYqyjCaka9M9nkC44NLbH/4Jy3d0hpEEuR5QefUIph28+bAUF8hFNNkTZ3Z6Jzksgb4592+bonQ== X-Received: by 2002:a1c:7e90:: with SMTP id z138mr16455722wmc.128.1564989427774; Mon, 05 Aug 2019 00:17:07 -0700 (PDT) Received: from MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id 4sm192986418wro.78.2019.08.05.00.17.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Aug 2019 00:17:07 -0700 (PDT) From: Ross Nicholson To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Aug 2019 08:16:46 +0100 Message-Id: <20190805071646.14780-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat/rtspdec: Don't send teardown if rtsp_hd_out is null 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: phunkyfish Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: phunkyfish --- libavformat/rtspdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c index 32dff2319c..3a79d1b175 100644 --- a/libavformat/rtspdec.c +++ b/libavformat/rtspdec.c @@ -57,7 +57,7 @@ static int rtsp_read_close(AVFormatContext *s) { RTSPState *rt = s->priv_data; - if (!(rt->rtsp_flags & RTSP_FLAG_LISTEN)) + if (!(rt->rtsp_flags & RTSP_FLAG_LISTEN) && rt->rtsp_hd_out) ff_rtsp_send_cmd_async(s, "TEARDOWN", rt->control_uri, NULL); ff_rtsp_close_streams(s);