From patchwork Tue Apr 16 05:57:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 12764 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 CDA1E447CE8 for ; Tue, 16 Apr 2019 09:04:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B27BD680C26; Tue, 16 Apr 2019 09:04:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5397F6809C4 for ; Tue, 16 Apr 2019 09:04:08 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id 8so9838280pfr.4 for ; Mon, 15 Apr 2019 23:04: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; bh=giIQo1K9XYnOGLFnIAjsrO/om+1DXQHORbPpRanSEGU=; b=enr/AZBBasUmBP9Ja9g1Siq3NKCPK6rMYoXo87jc0xi9b0+5zDhfZMUfNywQ7mQBBW zNTVVzViF5Fhwmi07frsir8SAIMfPhBw9+PF9IMC6JTuFo0FZ4J6MNAOSMTRV6kF3SqU gDBjVJg+Dx6MS6NWCMJY0VGyENgN1X2qg8ZBpV7qhF7yjs93k9PqisceAfeHSJ9sOUOg c4xUYHQJ8Qk/0t6h4uTTvqi7LDYPjXu5ZlxSIq9umRfYheMEL/YhcK+GdYfH4Gq+tYAS gFj0BgbGfxBVl4yG36vFwqiXtK+C0PYlKytxJnFkuoG13sUWhQy+HE1s903PXN8Fg/IP EEfg== 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; bh=giIQo1K9XYnOGLFnIAjsrO/om+1DXQHORbPpRanSEGU=; b=aYo1rYyrZ/namsTptw9q2jH/aDWDHX14zCbSa3P2ZStCTONo+9cvOVd07AHuSQ0nto 0BnIxLtmBFhlMH4yWumttmMHRliJVR4iHm4SMK668BDNq6tgHEVAeeFdiQhzbq0BLulJ xiqCqex7LYD6KlYM0FG9lKzqBzwsu3gREGoPFvvBZqFI8o3NYMQyUnD5GwP/0KT7/d9F I+lFwJiUzQeo6iphSmZOTl7ViyGsxq0Ta4Ek7yaf0FYwy/fclYxkDDyYePUOETfVeYfi 3sM7E9Zw9H5dwO+/LM7scqdXOIB/7QwdtE1WbJBuDPq+y5WeuqwwpFEwgTDupKmizgQX wsMA== X-Gm-Message-State: APjAAAVdfM6VkdCvmXUQly+EDvkB5V5W01Leqmg6ZPvCuh4J+kiSUvw6 JsxifyLs04UPCWcMSywUA7xiKxaH X-Google-Smtp-Source: APXvYqzDNUv0zrusywsnL8MWUehgQ0aLoIibp+Hib6Yv+rxvTtKf0Q8JbLgpnEezlvCqXG5FP+sN0w== X-Received: by 2002:a63:4558:: with SMTP id u24mr51560152pgk.225.1555394236959; Mon, 15 Apr 2019 22:57:16 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id g5sm35839248pfo.53.2019.04.15.22.57.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Apr 2019 22:57:16 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Apr 2019 13:57:11 +0800 Message-Id: <1555394232-29837-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1 1/2] lavf/hls: Remove HLSContext.strict_std_compliance field 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: Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao After the commit 9f61abc8111, we can use AVFormatContext.strict_std_compliance instead of HLSContext.strict_std_compliance to avoid the code redundancy. Signed-off-by: Jun Zhao --- libavformat/hls.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 1b61b4b..19ea88e 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -203,7 +203,6 @@ typedef struct HLSContext { int64_t cur_timestamp; AVIOInterruptCB *interrupt_callback; AVDictionary *avio_opts; - int strict_std_compliance; char *allowed_extensions; int max_reload; int http_persistent; @@ -485,7 +484,7 @@ static struct rendition *new_rendition(HLSContext *c, struct rendition_info *inf return NULL; /* TODO: handle subtitles (each segment has to parsed separately) */ - if (c->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) + if (c->ctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) if (type == AVMEDIA_TYPE_SUBTITLE) return NULL; @@ -1786,7 +1785,6 @@ static int hls_read_header(AVFormatContext *s) c->ctx = s; c->interrupt_callback = &s->interrupt_callback; - c->strict_std_compliance = s->strict_std_compliance; c->first_packet = 1; c->first_timestamp = AV_NOPTS_VALUE;