From patchwork Fri Sep 30 19:17:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 793 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp410432vsd; Fri, 30 Sep 2016 12:33:22 -0700 (PDT) X-Received: by 10.28.103.70 with SMTP id b67mr5117616wmc.43.1475264002197; Fri, 30 Sep 2016 12:33:22 -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 n3si6368289wmn.104.2016.09.30.12.33.20; Fri, 30 Sep 2016 12:33:22 -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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B32D9689E58; Fri, 30 Sep 2016 22:33:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F00E5689A59 for ; Fri, 30 Sep 2016 22:32:58 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id p197so3319051wmg.1 for ; Fri, 30 Sep 2016 12:33:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=DFvE36aRRAT7l0v8twYlBqKjctnpYKu3dCcPELf6m8o=; b=kqWqKPoIBy95xNroi7/3dU37epx//fjOAhWZFYrFgmXIkiI9lf4nhw+P9u4FD5QJaF JJ9Su2TU0in/gjVVtwwSFpADL7ECl/jukHLD3w1QgnUiPjX4WUijkyjabPOws6Q/zbEm BA8qc7AMtY5/teTmKz3pI3tl0qXsEL0LyFvrWqr46guyWGxUo8POEHc7w49Ns6pfXp+t qQ5t5mi8MeQ0l25JAtDC0GBO+8zuR9b+LW2/MrN5RgCFCPtroc9LOz9z6puV15WHFTTh 6C+oQub5pcUFeyhIbHj4789EAyZvuM/tmkIuyazFjf8omHKTuj+YOCMTMQQJpdYgEh82 1SfQ== 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=DFvE36aRRAT7l0v8twYlBqKjctnpYKu3dCcPELf6m8o=; b=jektqOYVvUEaqSAv/Grpwud/prAHv6E18U8bAzvDhYmRenOrTZiuUA/JbGO3dPQtLD UW3q2v9rjqk5PX2dEbM18jBpeuBNcha/UI2ABQysm0QuaZSVqrYWFlALSqrLjq/96pEs 6IQzkDlU9/UgM9JbTkAW/3nlCFnd1VZ/jTWM8JKiuZYMFVCSFXK9xuY26g2pUnFwrG2y Y9bog7+7bhCEQa6xVHeWqX3YB+J6dtOPoxxLb8p5XJhxZWKNre8/q3n8jJBqmh7gDLIn B+EV7UIJW/iTPCIOIX75KTbjwcR2bTZFygQKMTvZHb1dL5J6htjChEcO9eRGINmFZDuv WZIA== X-Gm-Message-State: AA6/9RkLaPuhp/XQyAeQZSQ85jDejHMIRXPDERQQC0Zlq5kmbRFAEFhzvKY8bpsTnrIK8g== X-Received: by 10.28.91.11 with SMTP id p11mr5153129wmb.98.1475263079706; Fri, 30 Sep 2016 12:17:59 -0700 (PDT) Received: from neu.localdomain (HSI-KBW-109-192-116-204.hsi6.kabel-badenwuerttemberg.de. [109.192.116.204]) by smtp.gmail.com with ESMTPSA id lz5sm20969929wjb.24.2016.09.30.12.17.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Sep 2016 12:17:58 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Fri, 30 Sep 2016 21:17:54 +0200 Message-Id: <1475263074-1089-1-git-send-email-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.5.5 Subject: [FFmpeg-devel] [PATCH] lavf/aviobuf.c: Adapt avio_accept and avio_handshake to new AVIOContext API 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: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- libavformat/aviobuf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) This fixes doc/examples/http_multiclient.c from segfaulting. Seems like these functions were forgotten during the white- and blacklisting update. diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index f3acb32..134d627 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1156,7 +1156,8 @@ int avio_read_to_bprint(AVIOContext *h, AVBPrint *pb, size_t max_size) int avio_accept(AVIOContext *s, AVIOContext **c) { int ret; - URLContext *sc = s->opaque; + AVIOInternal *internal = s->opaque; + URLContext *sc = internal->h; URLContext *cc = NULL; ret = ffurl_accept(sc, &cc); if (ret < 0) @@ -1166,7 +1167,8 @@ int avio_accept(AVIOContext *s, AVIOContext **c) int avio_handshake(AVIOContext *c) { - URLContext *cc = c->opaque; + AVIOInternal *internal = c->opaque; + URLContext *cc = internal->h; return ffurl_handshake(cc); }