From patchwork Wed Sep 28 22:49:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sebechlebskyjan@gmail.com X-Patchwork-Id: 775 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp41872vsd; Wed, 28 Sep 2016 16:08:07 -0700 (PDT) X-Received: by 10.28.43.129 with SMTP id r123mr10684279wmr.27.1475104087728; Wed, 28 Sep 2016 16:08:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 65si11817728wml.9.2016.09.28.16.08.06; Wed, 28 Sep 2016 16:08:07 -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; 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 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 D1FAC689F99; Thu, 29 Sep 2016 02:07:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C466B689F7A for ; Thu, 29 Sep 2016 02:07:46 +0300 (EEST) Received: by mail-wm0-f65.google.com with SMTP id w84so8073285wmg.0 for ; Wed, 28 Sep 2016 16:07:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=7Wzb0cVxxcfnjrKmUEgnfyyESMCjI+OLQ5Evl0Ifpw0=; b=zgXL1MNWhtwTNMM0csCP3xuz0RAtwONHtPs7T7bG+IVEqyiUPi3nxelryUPnMcm3XM 9rXQMlJTL01MH8Tw2ScN/adWy7varp5FxZuZptKB7M7BDWF6mljmXsXuRHiIeR6PajvY uZ4OHutJJD0YDezmSf6GFH/hcJ+a2hAt+I2YRzptun8KTsCFhX/fYa1g/CU50dPqVfTG BUnB7cxfxpYWuTHkUl5F/rwSCHblxJWtf50hWEVgoWyJRr7gZ/uFCfse+4HX+7oVkLbh fcqGtJHb/1cGHrGj+kZQty14gagBiluppJdC0jr6YvACfS7sLboe7mLjhvwqZbSajPn6 o4ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7Wzb0cVxxcfnjrKmUEgnfyyESMCjI+OLQ5Evl0Ifpw0=; b=l+xPDMt05t/B+DJkKNmJSYKBLb9TmaBZU+WHCNk7NvVZw7GpR2Z7CjT/8zbckFW0Hz zFmfCuK/tGhtn6QSCysffYW4J1MCwBMUbzPZ0OXWtuoK1LixuroDmbrHoqg+ruA4/oub XsChTuvBJs76qEfXciRWXfhLu98Jg5OCAoQDI+ZidlJiyaMdaeAWjiHk/jSeH9PKlMWl VIXdjWD+cKEhapuit/xx1L/8Mil47Lc1rz9YzBkr/5gl8JhZP6Bw37z2iEzETrmVKFQm FgZyunbQ7CPiYrqd/TtaxOsQmUDBpZ4NqlSm0WWBXbbDL0YUBGKyxL2kFwznffplZQpe tiHQ== X-Gm-Message-State: AA6/9RkHxmEfR4N0JU/Rt0OF1gN7KyawMitDfBjnWJKsy9c7t3IshG9tJ8zB4wIzv/1nhA== X-Received: by 10.194.87.197 with SMTP id ba5mr4713758wjb.69.1475102998765; Wed, 28 Sep 2016 15:49:58 -0700 (PDT) Received: from localhost.localdomain (adsl-dyn204.78-98-215.t-com.sk. [78.98.215.204]) by smtp.gmail.com with ESMTPSA id a1sm10675256wju.41.2016.09.28.15.49.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Sep 2016 15:49:58 -0700 (PDT) From: sebechlebskyjan@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 29 Sep 2016 00:49:36 +0200 Message-Id: <1475102977-23260-1-git-send-email-sebechlebskyjan@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat/tee: Copy interrupt callback and flags to slave 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 Copy interrupt callback to slave format context to allow user to interrupt IO. Copy format flags as well. Signed-off-by: Jan Sebechlebsky --- libavformat/tee.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/tee.c b/libavformat/tee.c index 518af4a..d59ad4d 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -161,6 +161,8 @@ static int open_slave(AVFormatContext *avf, char *slave, TeeSlave *tee_slave) avf2->opaque = avf->opaque; avf2->io_open = avf->io_open; avf2->io_close = avf->io_close; + avf2->interrupt_callback = avf->interrupt_callback; + avf2->flags = avf->flags; tee_slave->stream_map = av_calloc(avf->nb_streams, sizeof(*tee_slave->stream_map)); if (!tee_slave->stream_map) {