From patchwork Sun Aug 4 21:39:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 14234 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 459B244713E for ; Mon, 5 Aug 2019 00:46:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E17468A1B4; Mon, 5 Aug 2019 00:46:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7BD016883C0 for ; Mon, 5 Aug 2019 00:46:00 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id v15so72895251wml.0 for ; Sun, 04 Aug 2019 14:46:00 -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=tox/SmCS/+C0c6rnirW+cs0XvXzbs6oZNUC+Yjr2u5Nymgz4GAn1uPEF18VUO+kNLk ciMlfYZyRQWqPYBggJNv5PI5N4RBj8Eia/upxkGB8fxUHwZdVRb5/AbQWb5UQ7TbKesN JngdC/PpEgZipdw/xBH8Edhp2ZkEVD+9re5NW5GUmKkBfD3yhLUvRPxXrzTalyGUWwwN ZCaaAMvenS5s1WmTc9aPHS3XQdIhkC0tKFMw60Izo3009iQqDeAYxPU80jCv3P5fgJBu 14O3Te7bjQpYlcFsjzbzP+P78Wjo4IMdWDxSHXgCHKa+6zpoHzJeQSS1v7+pwlyvjlgK mCyA== 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=jAeQVUMZvCoEWSoqnSlqUSUkcXtd8XdlYLYHvIlJqRllRrCDv3INHxKklV7UHLS7Hd v5K5nolcPnVZsHT3O0zC0S0ikXAZ3KTGEqqu/IeuUMEfxNFFz9Atj7XmmPMuUmOeCggt YdGE2Fn9ge/SmAgIQ0CZ8fvfb4/9uPkyra/CYRUMYghOPzybH99qnLFIRMdIZ/AgLMut lzz8rwYZEFOFuQHuhNgWJN/F4DYJd0e/66UtG9Qf88B9YG5umPxGqWYBa7vkwMv8v78f gJHLS036WnGKyw+rm8KWggY+p/T0lF5IIi+tHQ/Bclj6niVqj0lsU7DtM1vCaBEDcVtF zdew== X-Gm-Message-State: APjAAAXSPVxqoz2KqHqGADmawy1TZ5GxsAKgzXxfZH+ls5ZTohW7iPlJ z1Zdxm6uSiDo7gNKskG2W9KB9eNG X-Google-Smtp-Source: APXvYqwJZzI2nzrqoB5LIPpCD4wALzQszHR39GGvoRHfU54Qw/Qjb79B7yEfYk0+F7KtCvuc0RhZAg== X-Received: by 2002:a05:600c:20d:: with SMTP id 13mr14788817wmi.141.1564954762030; Sun, 04 Aug 2019 14:39:22 -0700 (PDT) Received: from MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id y6sm68510411wrp.12.2019.08.04.14.39.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 04 Aug 2019 14:39:21 -0700 (PDT) From: Ross Nicholson To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Aug 2019 22:39:10 +0100 Message-Id: <20190804213910.909-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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);