From patchwork Tue Nov 27 14:18:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11185 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 594BC44DE94 for ; Tue, 27 Nov 2018 16:18:24 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D155C68A571; Tue, 27 Nov 2018 16:18:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 18A7E68A216 for ; Tue, 27 Nov 2018 16:18:19 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id y139so21886481wmc.5 for ; Tue, 27 Nov 2018 06:18:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=37LyzzIgUTn0v3PG12DBdFJGTCi2dC7L/t6Adquqt7c=; b=tH3xLbCqcZmQmnvk166urzBCBuDdq0g2Ae7DPvOam2s4OIjBUzq3lPxoLZFIoM0LzE iyo98QFozM2V7WPNP/9NjoXQEU+B3IJmGpcFxW7pV3KNXmR4pseUQirC1WXDazaOnGdT TB+NYQk1i/SQMOBl3zgT460tAcNWobDfW2MlJTdJuv1Lf0zuQ64og6wowcxDitS0f97u 3Wps5Dl+4J4FsbyhtxEOhSQTIQ4otvkN5gIX0aZNyUcqwVcqNKSUCyyEAy+DfQtmI+x4 uFotG0fuYulTo11PFiTfdhG6WkgBJE1bZKKg/oZEcWcnX0zT3GUb/2NYhBI6VlepwejJ PaYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=37LyzzIgUTn0v3PG12DBdFJGTCi2dC7L/t6Adquqt7c=; b=PQBhXvz+khWipQ/Ia6eB82nSNDjxlidueGMqURLy0/mU55CZyy7mN29rPK5WdbInui Ld4peOQtFicequPXFf255SDSB4bCMWT7xH8WD3SzOZ+fgTPsDPVVv63bHFaIkSA+qsXE ZzB62Rf3l8MZIs4YTndBmB+SSBIdbPTLcZgRE3pbu1gKJo7fT8DNxlnBI+osVKPnIJRe P7URd2bDRhlxnpY/Nbfs6ptoY9K/B+ouIsDGhWX+ckoCBxHJMX7HFcdK7wNaL/NyqE+L Ot8nLdUitNKHTm7I+CiKhcE3RKjlkVVP08PR0MGjYAH/rz57KRqV/m98/nbV7Z6S+Eno OWIA== X-Gm-Message-State: AA+aEWa2CXK3miFFAs86zrdQpA1ciOuIBfRgKA6lectV+vCBoXnEoKjN i9VQa0qCd29Szjp1XIr4gBL3qHDP X-Google-Smtp-Source: AFSGD/XXmnvemYc9XozaBVb8lzf8kRrC4M3NkjildzB3/JeIL9TG30kYWZuXIZFvChNRkG7ahJneuQ== X-Received: by 2002:a1c:16d5:: with SMTP id 204mr184598wmw.148.1543328303530; Tue, 27 Nov 2018 06:18:23 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id v133sm5213684wmd.4.2018.11.27.06.18.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Nov 2018 06:18:22 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Nov 2018 15:18:14 +0100 Message-Id: <20181127141814.30059-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/opus: set skip_samples 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes #5258. Signed-off-by: Paul B Mahol --- libavcodec/opus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/opus.c b/libavcodec/opus.c index aa827b604c..22cda64801 100644 --- a/libavcodec/opus.c +++ b/libavcodec/opus.c @@ -31,6 +31,7 @@ #include "opus_celt.h" #include "opustab.h" +#include "internal.h" #include "vorbis.h" static const uint16_t opus_frame_duration[32] = { @@ -325,7 +326,7 @@ av_cold int ff_opus_parse_extradata(AVCodecContext *avctx, return AVERROR_PATCHWELCOME; } - avctx->delay = AV_RL16(extradata + 10); + avctx->delay = avctx->internal->skip_samples = AV_RL16(extradata + 10); channels = avctx->extradata ? extradata[9] : (avctx->channels == 1) ? 1 : 2; if (!channels) {