From patchwork Thu Jul 6 11:05:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sebechlebskyjan@gmail.com X-Patchwork-Id: 4225 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2053753vsb; Thu, 6 Jul 2017 04:11:03 -0700 (PDT) X-Received: by 10.28.230.211 with SMTP id e80mr25269166wmi.17.1499339463083; Thu, 06 Jul 2017 04:11:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499339463; cv=none; d=google.com; s=arc-20160816; b=yIicA1+cHnyWa5L1AGrqVlMU8j4sWEHwzo6M+Dr/dmwnVvRBebbhX0B25Rx+6H8GCs 3z16aoqKlw/fQVSH7G95m5wxFGGPbHPmFsYKv2ik33jAFY3Hz1bFrf2Fb7R3gVuO1lnU eh+7Lw3icK7kP6R1YLCb7WcRr8cZco1yEyVplTZqdECvSODpSAwqfweFqQkJpkQBE6gI nD5v5G5OWJkUVzL10m7IIe1ekeIUuTuLJj4GpJw1gDVy3NLKdgaWsYEH5d2v8runCEtl 3psVkI8lld0wb7gHxho8UR7vkcP1im+hjN+7WqQMM06RjPwNdzPnokpc7BJBnjWkz809 FutA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=bbyQn1ocUKNWXxwDhxkCucYDZO9NdXJGjQMIntv6xIE=; b=nh8ncyFYoQeN/Xs5iuTmYdoDu5nQqz7do871YVh1XwBjNvDVo6CxUaMXFJ6Y7BLEXt Yp94WUlPBJCOSweRWjwsrGA2pjPfsXAtGA4ftR8oNR9VO7m/p7rxt1untuzwEeHPHYoN b4lpTZoQklnrJzKV+5iKPldmH/N3XGP61nztkqe/Vlfkr2kOq964dYVSsOrhz9xw5FcP b/QANU6/USxin1UOBj0gF8jv+OfL8vh2C6yN0FBmmzvCUUBvYkdLDeAZUjzzeXCD39CR 28+sJz9AbGNvB5N5kgU329bl9dkJoZ8cihYmcDZNHX4k0LdjdR6pu5wza0bSY4xF+yQ0 KLRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=QX5AzuBY; 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=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a81si19665wrc.132.2017.07.06.04.11.02; Thu, 06 Jul 2017 04:11:03 -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=@gmail.com header.b=QX5AzuBY; 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=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E4066883D3; Thu, 6 Jul 2017 14:10:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E92C680596 for ; Thu, 6 Jul 2017 14:10:50 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id 77so4208560wrb.3 for ; Thu, 06 Jul 2017 04:10:53 -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=Uiq3PEAhq0y33CYKjZTSXdim74k/zhypUuCKPVtzN/k=; b=QX5AzuBYJOtjwuFzmfZZ3Eq6C5v6iyLkpitN78DVWhF8kXV5mWuLQv5O5TdR9gDMyd 1Etb1TD5k3Cc3HvGJiipQCVZ3Lubijj78ME7j8BgR/3mZ0+cnvqetvjX7Jo9l7QdFLCw Z7ZyVmp6Q20EG6/HGFY3ubBj7VbiIZ7ABuRqquPIUdFQKM6wBKljOqwRkq7ckvgZR716 3fm6YNVSIYvxIeuTeGKBWaupOVgRPnF+5z6ZfV1GrTXgzdxmhrO6QyDhQgi2EZVVZaQK Fbmyniljn+1pLhN9Fh6vw2o9RXBmZcSl1kpEShgs2DN7T3SHUbM+DfCOXg6fFCwj3p6D 6/8A== 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=Uiq3PEAhq0y33CYKjZTSXdim74k/zhypUuCKPVtzN/k=; b=VM/BSY2sa3JRSpObvF/9JDsLaG87EFV8xl+83H1ltkkV6JO/zN5ruyCngEq6y75wC/ EQQnSP2SUr2ZdosxrtlNOUQolal0A1Ft4Fipro7KZcRxcx5tgPtjMWd2oPf7OMNk13pA MaHcJh8vf+ojPQG5Ug49oF/UezEKadZvHDgmvkH0snHKBC2+so2njP6XaJuQGihDWG0C 8/HrDRiEsfEzshOLpqpwIRDME8i7swAzl/BZuwWlxSeIMm8JUt3wvBLdYo1vf3pIvwQq Ai9I+XrIQGtr+HYGGdbxIQDX/OObN30Hlq/pxFIvZCsXFjq350rasnaJFvWrzvMbzIUK WxbA== X-Gm-Message-State: AKS2vOwVK6SX0Ij4Rsp4hERsORKym5FxMdr9HegzBV67Cp1e8K+tpbdE 2NV03XcvwPsZ6cun X-Received: by 10.28.238.5 with SMTP id m5mr34465143wmh.86.1499339127456; Thu, 06 Jul 2017 04:05:27 -0700 (PDT) Received: from localhost.localdomain (adsl-dyn137.78-98-239.t-com.sk. [78.98.239.137]) by smtp.gmail.com with ESMTPSA id t204sm20501wme.2.2017.07.06.04.05.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Jul 2017 04:05:26 -0700 (PDT) From: sebechlebskyjan@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Jul 2017 13:05:14 +0200 Message-Id: <1499339114-1984-1-git-send-email-sebechlebskyjan@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [FFmpeg-devel] [PATCH] libavformat/fifo: Fix initialization of underlying AVFormatContext 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: Jan Sebechlebsky MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jan Sebechlebsky Pass filename to AVFormatContext of underlying muxer. This commit fixes bug #6308. Signed-off-by: Jan Sebechlebsky --- libavformat/fifo.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libavformat/fifo.c b/libavformat/fifo.c index 2cbe5c5..c881f31 100644 --- a/libavformat/fifo.c +++ b/libavformat/fifo.c @@ -442,13 +442,14 @@ static void *fifo_consumer_thread(void *data) return NULL; } -static int fifo_mux_init(AVFormatContext *avf, AVOutputFormat *oformat) +static int fifo_mux_init(AVFormatContext *avf, AVOutputFormat *oformat, + const char *filename) { FifoContext *fifo = avf->priv_data; AVFormatContext *avf2; int ret = 0, i; - ret = avformat_alloc_output_context2(&avf2, oformat, NULL, NULL); + ret = avformat_alloc_output_context2(&avf2, oformat, NULL, filename); if (ret < 0) return ret; @@ -505,7 +506,7 @@ static int fifo_init(AVFormatContext *avf) return ret; } - ret = fifo_mux_init(avf, oformat); + ret = fifo_mux_init(avf, oformat, avf->filename); if (ret < 0) return ret;