From patchwork Thu Oct 27 19:20:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1206 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp732768vsd; Thu, 27 Oct 2016 12:20:35 -0700 (PDT) X-Received: by 10.28.153.66 with SMTP id b63mr250305wme.79.1477596035817; Thu, 27 Oct 2016 12:20:35 -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 15si4978200wmo.95.2016.10.27.12.20.34; Thu, 27 Oct 2016 12:20:35 -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 CCAE2689F1A; Thu, 27 Oct 2016 22:20:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E57E7689E23 for ; Thu, 27 Oct 2016 22:20:23 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id c17so4141823wmc.3 for ; Thu, 27 Oct 2016 12:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=GXU7cTxqDxA1DulIqaLaOdQPk1GK0vK37oBfyBjJUmc=; b=S+IkH3GMfItT94w7GPhEH2yMMU2hD1wSiqVAfuvFCESKG2nv7GI0wSQ3Yon5g9lvhS J9Ya8WTRIvKJevZ5B3BtPNwX4NyLcREbXfRR8dnl04s3ynjW5vjJ1gUqhVHXKRQZpoPs QRpSK4Yg+eI/EKaipYKl937XwJg8A8u8rE0PKWSoj3WAdISgAgmCHYpuGlOcjzRvbhG4 +86zWs54odBxAckb20k4xwzd3HIrwNsr4ayhs9mBm/wUfRkVhQ6vCtZ+9WfVbQ+IoBDI P9hkK6TuV+HJVylHwWxAht7dlxTs8lwzSG1iYOz1XU7aKkAG+eVTR0beKRBOnPDBIDj7 ySdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=GXU7cTxqDxA1DulIqaLaOdQPk1GK0vK37oBfyBjJUmc=; b=FNASZoxVMguR8Kv1xteV42EoDLeJ78Jf8iyV4ioUcTGFIRDa5oXrXgtyfQoO8xWhtx 6JMmxAWyRcgpxXAuKprvr0/ZYzwGGAP5ZkrrCS+y6UDEY7CBxyP2UEdpgInHqOGoMOPl /p2L55bXg03hsX6Mvnhbq+uzu60E9QZffzJGk8SoxGsu95OyPwXxJn9N22DIIvLHL4xJ irpb43ma0H3ciVFDFC96122RIuNBIUQwrTcYjXr0l1WhewcWIx0QVm1lPQQbsEBesVoZ 8HR7pUKtvrlGGgoSGFFf2FtLK0PMWnXvpoq8xYcUO8JbMWhrcsPaMqBjfs/PwC2gn+oJ +T/Q== X-Gm-Message-State: ABUngvcRqFYiTjYHFu/4+/krpiuYZexubicRMNaQZhQTT8gC2xBRhsC1f0lOK+nwm7hRjA== X-Received: by 10.28.62.141 with SMTP id l135mr215406wma.121.1477596026722; Thu, 27 Oct 2016 12:20:26 -0700 (PDT) Received: from [192.168.2.21] (p5B095458.dip0.t-ipconnect.de. [91.9.84.88]) by smtp.googlemail.com with ESMTPSA id r72sm4877905wmd.21.2016.10.27.12.20.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 12:20:26 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <971a8fc4-5464-8f0e-441d-9c2ce018e2cc@googlemail.com> Date: Thu, 27 Oct 2016 21:20:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] hls: always call avformat_find_stream_info for subdemuxers 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" This fixes probing dts/eac3/mp2 in hls. This partly reverts commit 04964ac311abe670fb3b60290a330f2067544b13. Signed-off-by: Andreas Cadhalpun --- libavformat/hls.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 3c09dd8..2364144 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1750,17 +1750,9 @@ static int hls_read_header(AVFormatContext *s) if (pls->is_id3_timestamped == -1) av_log(s, AV_LOG_WARNING, "No expected HTTP requests have been made\n"); - /* - * For ID3 timestamped raw audio streams we need to detect the packet - * durations to calculate timestamps in fill_timing_for_id3_timestamped_stream(), - * but for other streams we can rely on our user calling avformat_find_stream_info() - * on us if they want to. - */ - if (pls->is_id3_timestamped) { - ret = avformat_find_stream_info(pls->ctx, NULL); - if (ret < 0) - goto fail; - } + ret = avformat_find_stream_info(pls->ctx, NULL); + if (ret < 0) + goto fail; pls->has_noheader_flag = !!(pls->ctx->ctx_flags & AVFMTCTX_NOHEADER);