From patchwork Mon Jan 23 17:55:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Astroza Araya X-Patchwork-Id: 2297 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp1352743vsb; Mon, 23 Jan 2017 09:57:56 -0800 (PST) X-Received: by 10.28.166.215 with SMTP id p206mr15945126wme.87.1485194276723; Mon, 23 Jan 2017 09:57:56 -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 f1si15120484wmf.72.2017.01.23.09.57.55; Mon, 23 Jan 2017 09:57:56 -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=@astroza-cl.20150623.gappssmtp.com; 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 C3D3E68A340; Mon, 23 Jan 2017 19:57:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C690068A29C for ; Mon, 23 Jan 2017 19:57:33 +0200 (EET) Received: by mail-qt0-f194.google.com with SMTP id f4so18952128qte.2 for ; Mon, 23 Jan 2017 09:57:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=astroza-cl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=qSmta2dW1NlqWQ8eOEUTcPqUEdS39FgQk6KVatl9IfE=; b=oALXsVFmSyMXQYacqtGCUxsFgDS5a2+yMfDcFOETbSIL1DRfldILDsQOck36E4dmQo Mny/Xnvu2Ek5JvpmDggau/pZHclX6JymkmOHH07DuO2akcWjNGwqJc/ZJeRO7Psn1qCv NmJEeJO3ve9AZz11dNNOUPzhUvljMC/cuD6KTxxkdMnB08lvf9g6n3MdGRqDP9fQHr6+ FuGOOBtvhoglm3Bjo49zcybTYg9U+G701HF9E2FsQnM1tTeyC4lxW16ye4pfuSe5UtUN bpoyVjw+JXy8+VaeIaQbYyTEHOb0EPco2vWwDUvbA17ykfPURWUhPMO5OkGkiFjSX49h qfzw== 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=qSmta2dW1NlqWQ8eOEUTcPqUEdS39FgQk6KVatl9IfE=; b=UJlRtzhPBkS2US4OGaMXfxOZOv/z0MLjk9j3vvJLeL/OEnAHDrCj9DGLmqULVeGaLR cMM/WF1orfUqoIk0RE0uZBcAxCaHhU/vJfr4uGCkeV1QG7sKWE+q42nsJqhqI3Fb4G57 mpDwKLf8OEiBvXGBjf6p9XQKN255r6WA1VhlPIdz6HNuJtb6Uwt9oHJuGAZ7tzv00Xrk nnYcF24FhBJreibtt8vXCcLBRh02RszhBuBqyvvMBqyLui218RUaKcVSbzjbJD2o8Dnj TH5176qDw8hrBNdfSLFbVGjcveULu2RZm/n9DcqHxWeG7L5vGdJEkVLcJz0LIbgyQyKH xziQ== X-Gm-Message-State: AIkVDXLr5Y7tyXMZEXPUUFuSicwuDC7a8qxOE8EBk2nbJGLiFTfMt8cVJXWdV1hnLUsZ7g== X-Received: by 10.55.33.163 with SMTP id f35mr25258370qki.66.1485194265167; Mon, 23 Jan 2017 09:57:45 -0800 (PST) Received: from freya.ned.cl ([186.67.84.242]) by smtp.gmail.com with ESMTPSA id d15sm13767649qtg.22.2017.01.23.09.57.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jan 2017 09:57:44 -0800 (PST) From: Felipe Astroza Araya X-Google-Original-From: Felipe Astroza Araya To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Jan 2017 14:55:31 -0300 Message-Id: <1485194131-32227-1-git-send-email-felipel@astroza.cl> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] libavformat/tee: tee was passing a wrong option name for fifo's format_options 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: Felipe Astroza MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Felipe Astroza If fifo is enabled on tee muxer, ffmpeg exits because of an unknown option passed to fifo muxer. Option name "format_options" was replaced by "format_opts" on tee muxer. Signed-off-by: Felipe Astroza --- libavformat/tee.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index 99259a7..dd1844a 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -208,7 +208,7 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) if (ret < 0) goto end; - ret = av_dict_set(&tee_slave->fifo_options, "format_options", format_options_str, + ret = av_dict_set(&tee_slave->fifo_options, "format_opts", format_options_str, AV_DICT_DONT_STRDUP_VAL); if (ret < 0) goto end;