From patchwork Mon May 28 18:27:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9134 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp2231580jad; Mon, 28 May 2018 11:28:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJRVyLJOTL2wz0kitP4VWtvlhnDT3kEMsBTkfZsXEiRbPEpVFYLtPWYUSondGh8Mal+aG30 X-Received: by 2002:a1c:1a49:: with SMTP id a70-v6mr10600473wma.77.1527532105117; Mon, 28 May 2018 11:28:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527532105; cv=none; d=google.com; s=arc-20160816; b=SpQGQ2LUnftenLp1WJl3NSkq0D4v845iDC8J9UUBfZ1JyT/d3rhZkyAOHY1p+l0dBG C4ZGFjaNcyIzlvgaMNx2tOwo3RVIGnZoTWvaNTwliLM3KNdcHegD+eyJvDM9EmA31KNt N/I6zBepF8/LsLaOqJ4s5qF5foXgMtl2062EdN1C+tKV8imPIF4cxfpBlLnpmA91mSF1 W3mZWjuw7MjaFJmgr3r30hL+FxOS2LvU2QVp2Me+iLVb0roOnQjcUcuIA/AZMOUIrDyZ Bo5zC9sgMTVgNJXaT6zMbYd/KtWirQGIsMK/os2FZr9x5CTwye3Iyh14Mw0zUgcpk1Vb d/ag== 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=TaauAaVVuEUcxea839iJQsh8yFdVf7e7PORaJsKQZ8A=; b=DSTHJ4lkAvq1UjC5hJOtYijdItb1sHp/v71X7QVY7Ytkm6OHR/1oQdrsbS+8K0YdEX LkqoGl/BH9O14EB/fiEY9tudyYQkerycwm7bTDcGpsZmlXQX2FkyCdA/GBHTB1jGWdWt kTSGFcfvxXiqwddQrxpFWVbOeHx0+FaLk8R9umO9vYvWDTrsrgo64/0mcjWWfjmIkW3V VzIMwW86fH/j2M+HbMqclEzIMcrr0MIJJ5yS6xbMP57/95DJ0FpEz+Pkb7X2anhkEndL gRTUhZt7U/Jcw0Ex/m0VPo/4+0BiN/hqU/pBhm7P+sg8ifIOpSWXbY2xb+6ONAhyLZkI n7Xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=hHtIkt50; 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 42-v6si16733310wrl.416.2018.05.28.11.28.24; Mon, 28 May 2018 11:28:25 -0700 (PDT) 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=hHtIkt50; 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 553BC689D3E; Mon, 28 May 2018 21:26:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D162B68A3BC for ; Mon, 28 May 2018 21:26:46 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id a8-v6so34134662wmg.5 for ; Mon, 28 May 2018 11:27:30 -0700 (PDT) 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=sXzEH/5jqXnz4VHrYhPBbBueSSQCT6D6QlVX5LCwX2o=; b=hHtIkt50IDIhEXSWtuRUjbtGSSVw+/XmxnW7f7CDLtAQ3RjUeZGBkwRWNBk+lRTTPG mtf8lVfXLt5SlpU7iaP6diJQACdO2FfKOF5Nzi324ZlgGhIRl3ZQth2u5K4auynqjRGc gJFq20vPnIOVoLrnKNTV/ZzWXvQgJD7+lC3FWABcGXZp7LCoQHbJ7lSnwupOAFKiK0fe LDUq1NtixuOqD+jS/aHXKzQv7tfZf7bmj0MzwO03q/0dBdX+a2fOWfho72jcWZFOUzVJ kFXB9WZ8j3DaKbj1238RVDmU0bgvWoILXRYKtKKiekHgnz9TZj3BZB3U3QYIbpPnOOUL t+yw== 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=sXzEH/5jqXnz4VHrYhPBbBueSSQCT6D6QlVX5LCwX2o=; b=iyJzSJhYy3epxcNT5OnLLcZoQlnl9SVfTqglOoME/4+oK1ymljCdIStW1czQql1VPU u414xsxGzMXeaLXJyWoEjOsQ05hKtopIGQhVMAqSfeFK/NPTXGDlBP4IBkGwPklB+87i CoNan+7ameqClmnHiQ0cnjN0lmDAhCgKNJm3+RxSKJ0rRhkNkZbWWc7wY+xZ4aM/YhkO pNa4LSjVrYaMeKm+rAcm/m4CdetETgJ/vhMx8/oRZz5gXp9kiMmWbUPxKzbxIjttasx9 j9xL8hwolXpGZe6oCZS6Bk4bSO02seSci5Mj5Pd4IEed+woc/a1ed/D+IKQvuL+0QNN8 fR6w== X-Gm-Message-State: ALKqPwdBQGwOvBV8562pMpbXHmo8yeYt5KnE2WBInlQQcijgu5nVp7DO JWrC1yMCwxPNJXsr7n5taLJi4g== X-Received: by 2002:a1c:1a53:: with SMTP id a80-v6mr10291966wma.36.1527532049817; Mon, 28 May 2018 11:27:29 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id g205-v6sm4126285wmg.43.2018.05.28.11.27.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 May 2018 11:27:29 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 May 2018 20:27:09 +0200 Message-Id: <20180528182711.3221-9-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180528182711.3221-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 08/10] ffserver.c: Simplify codec_type access in read_thread 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- ffserver.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ffserver.c b/ffserver.c index 171da51..65b12da 100644 --- a/ffserver.c +++ b/ffserver.c @@ -86,8 +86,6 @@ void *read_thread(void *arg) tb.num = 1; tb.den = AV_TIME_BASE; AVStream *stream; - AVCodecParameters *params; - enum AVMediaType type; if ((ret = avformat_find_stream_info(ifmt_ctx, NULL)) < 0) { av_log(ifmt_ctx, AV_LOG_ERROR, "Could not get input stream info.\n"); @@ -98,9 +96,7 @@ void *read_thread(void *arg) for (i = 0; i < ifmt_ctx->nb_streams; i++) { av_log(ifmt_ctx, AV_LOG_DEBUG, "Checking stream %d\n", i); stream = ifmt_ctx->streams[i]; - params = stream->codecpar; - type = params->codec_type; - if (type == AVMEDIA_TYPE_VIDEO) { + if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { video_idx = i; break; }