From patchwork Thu May 31 22:24:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9192 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp161627jad; Thu, 31 May 2018 15:25:15 -0700 (PDT) X-Google-Smtp-Source: ADUXVKImZa49gOWZZxY1FdFcC7GkNgxca80NmB/rJ92UsM+6Q1SoCuDwSva15Ktmlj8Zg4x9+Sms X-Received: by 2002:adf:a54a:: with SMTP id j10-v6mr7346772wrb.155.1527805515257; Thu, 31 May 2018 15:25:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527805515; cv=none; d=google.com; s=arc-20160816; b=Eka4Kn3jXqOsPF2uz8g+NzYGA6Z1Qv1GCtFJtVo/MMIxIWY0LqHPxuEMogvRgnVdC1 mklfpeKKDHHTIZLe8J3ifwl4k6uVgL4vINVEtssQK26fs9eEbi/Y9IOPorn4kBcA3sjx wqcv7LIoG3E/RDrLj4GI339Pmc4Y/liayr0iojMkTPfxNnMWMxpZOVczb5vhHD6LC2Ub b2LcxH7zitbPTnChs8mVdHtV9Lzw5YqnzQcnAsug39QUshnMMhdruYlRTSWelfdDLswn wP/2HvHQrmsvqwTNGMQegUqneye2t1vNbGdZRnrlFRlr8J3359G8A0rJAi1stZGfaaUF vAiA== 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=5tD/gIR03C6BA8AURdZpDr/+qCv1gZ3NlIyppgpa+bk=; b=x0RL9+EhCSuMJwWtktG18hR8Q+yhos/imtwiZLEmSxxGIFwDalmqLyaFWeizote7K7 TjKP7OOUc/4e+Cd3oycuvMdmjOPdOwFB0OTxKwRzkKqBVTmpkAvZe+Rc3LtSYGyizkt0 1g0XLA5G/YSXUadylXWi3VpteowLxqz6w/ZnuxZ3scx17ybII58peAH4dz7BkZeP/z32 YTw4XmBM0T7FrnRIGqKYmYzzhAAcGwMse5UduIM2wbbT8uE9R3Sot9GhP1qZzuDz6EnE +xv3CdjjnIRbAUJ+9aeoYtNXC43DQyKPKP73o2Ex6PNN7a1yYvAj1MezQyWNuer8TgPC lI+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=ky0R5DyH; 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 z6-v6si4768195wrn.224.2018.05.31.15.25.14; Thu, 31 May 2018 15:25:15 -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=ky0R5DyH; 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 4B6E868A4A6; Fri, 1 Jun 2018 01:23:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A627D68A48B for ; Fri, 1 Jun 2018 01:23:50 +0300 (EEST) Received: by mail-wr0-f194.google.com with SMTP id f16-v6so19122750wrm.3 for ; Thu, 31 May 2018 15:24:35 -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=5cLOIBcoq/8G5zMvtbQdT4vEyenWky59/7IJWt7CuAI=; b=ky0R5DyH8Frpd7XTjgkQk8DRjsrh/Ga4Wi8nm5pYOLpeSFVY4J/lMlYsQY5OZj5XB/ woGimDzrAjt/1mpnjpCBfomxAOwi74umuUIvLOXi9euJNvoDuxdf+UTe3Re+pqcciIcB XNUVvOMHg8ApfpUSwAT3CYNfNP1vhxWysEhu6G5FtOuyPI137GVHU6RBpcvUc0qlzsIb 8xrHRRL1NnqqLzv/kj8e+3JirsVbxF7Wxw7ZV5UDY5MgpzsMLpz7sUr/DXnkBw1jolb9 0TcwOWX4zvJYOqgWE3UjQ3XRXGM877HbYBRN+CjTtp6yhSjtZuY3Ss3ktS2+m39Tz6KS rm8Q== 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=5cLOIBcoq/8G5zMvtbQdT4vEyenWky59/7IJWt7CuAI=; b=LMyr8R6VT+mYMS3YnwQpmaNcoSn1gXnqn6AHcbFqBkGGTinBwR+jO+KL2ZX6ixwPfC lzBb9CyAJ3zoMk8CP0ahRzsPJeuSXNAQ5WhX9bWMu15knvy/2wZaIPpSG7czotSB7VfG EiJesEIXXKaw/z726moNrSkZZ+gmp/mC/EjI9EH5wAxWrFLFRf1rZCdl7RJV4FYIpwTl gWBKm8gDhxkU5UxUPKkO5KtPrrMa5y5fEChwbKts3ZqmWvtWiURW6O2XigJ9nRDFBavp e6OLFvJnWEjuSV3ehP+9domszYYyIbw22N/1Idc8S5GV2H0NvlpFShqR66oTnvMZZntq 5NLA== X-Gm-Message-State: ALKqPwcukSuoKOGYPXDzGEfrbRIv/aQ+jNHGW2TqbCaAHuyyEAgWxgKv gcmxANzHSR/M1OcJ5ABfNV5oEQ== X-Received: by 2002:adf:ab96:: with SMTP id s22-v6mr3416517wrc.90.1527805475112; Thu, 31 May 2018 15:24:35 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id b72-v6sm705017wmf.11.2018.05.31.15.24.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 31 May 2018 15:24:34 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Jun 2018 00:24:01 +0200 Message-Id: <20180531222415.24966-9-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180531222415.24966-1-klaxa1337@googlemail.com> References: <20180528182711.3221-1-klaxa1337@googlemail.com> <20180531222415.24966-1-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 08/22] 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 ddb3e6f..3abf5f8 100644 --- a/ffserver.c +++ b/ffserver.c @@ -84,8 +84,6 @@ void *read_thread(void *arg) AVStream *in_stream; AVRational tb = {1, 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"); @@ -96,9 +94,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; }