From patchwork Mon Feb 6 05:57:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fairytale X-Patchwork-Id: 2436 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1921073vsb; Mon, 6 Feb 2017 11:37:51 -0800 (PST) X-Received: by 10.28.147.72 with SMTP id v69mr10318711wmd.51.1486409871455; Mon, 06 Feb 2017 11:37:51 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r19si2095819wrc.146.2017.02.06.11.37.50; Mon, 06 Feb 2017 11:37:51 -0800 (PST) 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=@ftlabs.org; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8EFC2689748; Mon, 6 Feb 2017 21:37:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDBB86899C1 for ; Mon, 6 Feb 2017 08:26:33 +0200 (EET) Received: by mail-pg0-f66.google.com with SMTP id 75so8233451pgf.3 for ; Sun, 05 Feb 2017 22:26:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ftlabs.org; s=google; h=from:date:to:subject:message-id:mime-version; bh=knmhT5U0GgeFo+z5FiSkfvO/bA3lh7ob0btQSO97qG4=; b=w/0yPFsGAFiJr/d+SOU/lv1TpOrJJcaTGE4p3jItJPy+UKzyfF7OzhR8/EPEs7XEh1 gXtiBCJx7ZdYD/Jn82xICADYrt35iyKlDTyGdDQrzfZw3hqCO949Zg2G11zNXsxQDpQx /0NwwhY+jiBOfueX/JdlPChJi3LDeeL04V2YE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:date:to:subject:message-id:mime-version; bh=knmhT5U0GgeFo+z5FiSkfvO/bA3lh7ob0btQSO97qG4=; b=CPeI6G82hOTqUkYV/QuHwSqU+F//u4EJOqb6/zXs2iLt6SuGyEcGTjNnnaThAuZzwc dp+79EpxCbr89r790SUcNMxadheRYa8IvvtFnPEN7bTAlfHMAJydtr6/7UMzwpUBQKJv saB1664kaya3eSvyJCz0i0Sy2BNVuD377DxhB5RDs6hWfAMlHyDXrwX/ypQ+d8uQBNBI c2+2kc17Io5BN5uPnbAlL+ZZJR/By7kw24EcrzhJkV60n7Glx8wWxeWMnmvBmnW7ikiT By9hpu1OKoiwePT56DxOpDSonsXPUwO4JfW/D97L4ZUqK2q632VXlWOGJLXQsMsH/7yQ uwDg== X-Gm-Message-State: AIkVDXLDio6yPrOH5hHUQH185IqcMHmxc5CzrVeGCwZ+PgNAjzP4/KiWwaAOffC6kS9f6g== X-Received: by 10.99.8.194 with SMTP id 185mr11640506pgi.76.1486360646792; Sun, 05 Feb 2017 21:57:26 -0800 (PST) Received: from XIN-K.local ([175.100.202.33]) by smtp.googlemail.com with SMTPSA id d78sm85170150pfb.43.2017.02.05.21.57.25 for (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Feb 2017 21:57:25 -0800 (PST) From: fairytale X-Google-Original-From: fairytale Date: Mon, 6 Feb 2017 13:57:25 +0800 To: ffmpeg-devel@ffmpeg.org Message-ID: X-Mailer: TortoiseGit MIME-Version: 1.0 X-Mailman-Approved-At: Mon, 06 Feb 2017 21:37:44 +0200 Subject: [FFmpeg-devel] [PATCH] Allow Data URI scheme for hls 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" #EXT-X-KEY:METHOD=AES-128,URI="data:text/plain;charset=utf-8,abcdefgh12345678",IV=0xffffffffffffffffffffffffffffffff video-js support this and as ffurl_connect support data uri, just allow it. --- libavformat/hls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 3ae3c7cc5c..77917f0e44 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -617,8 +617,8 @@ static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, if (!proto_name) return AVERROR_INVALIDDATA; - // only http(s) & file are allowed - if (!av_strstart(proto_name, "http", NULL) && !av_strstart(proto_name, "file", NULL)) + // only http(s) & file & data are allowed + if (!av_strstart(proto_name, "http", NULL) && !av_strstart(proto_name, "file", NULL) && !av_strstart(proto_name, "data", NULL)) return AVERROR_INVALIDDATA; if (!strncmp(proto_name, url, strlen(proto_name)) && url[strlen(proto_name)] == ':') ;