From patchwork Tue Nov 15 21:51:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1434 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp1834761vsb; Tue, 15 Nov 2016 13:51:47 -0800 (PST) X-Received: by 10.28.49.193 with SMTP id x184mr5660728wmx.44.1479246707280; Tue, 15 Nov 2016 13:51:47 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g66si4582740wmf.113.2016.11.15.13.51.46; Tue, 15 Nov 2016 13:51:47 -0800 (PST) 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 9AA7B689D30; Tue, 15 Nov 2016 23:51:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7589B689BDE for ; Tue, 15 Nov 2016 23:51:37 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id g23so4568337wme.1 for ; Tue, 15 Nov 2016 13:51:37 -0800 (PST) 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=BGwGRi9I94Cwxw4wKquIgJv78V68SZhMoSvMFflooQg=; b=t/nw8PvlYEKlrrqXFVhwN/08Nj3kxmidXR9Qxg5sunpbrHFhprxth+trAHQ3HKhsaL UR29nlPzb/8gmiH720I5ISoVk0rXss61fhgv/QGGc0nVpT+vpJIUorq5BgsFiUvJ4w6d thGhMp5eodGA39n7BgdZ0/KtpVne/sppxygmfAA7dYCHnRK/WGPsgvrkFGNpDtxViAqR DzCnEl+lyLCya6UgFeYb5Ydeh2uLWFozsZwfwOMtpzKmwnGC28jORc0Z3tH073JgpGox cINjGmN5BQrN54ShErmlUh4tSXVQ0abOUWqlgeaS1GNgR1sviRhpy7nQt6+UzZHKoM5h qqIg== 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=BGwGRi9I94Cwxw4wKquIgJv78V68SZhMoSvMFflooQg=; b=cAICyAzTqSK2OEu4T2K70erAvx65QWyc54qZfxpJpon3D0DCq9uryzRq4eJ91IeXP2 tFWYZeU7CVOqkbADQIffWZokMk0z1Yxi8hxNhCOBHrq4DFPzsDu7OJoy9i8aiXExtLrv +1lkFt0MvvW9PPybX9GMajbW3QJLypnfdaecLY4SjLwJ+gCziC881xRfGT77QmfMkTUG k/bzb6sdOsxsgM1yHt+h1PfK23TZnqf3R+ib2RmbsMl/nxNjRcci1tW1JH7vhW/15yx/ lOHcL0dXGQgYmemoJIogGjQgh3IAwA54n8zXfezGJUYWdXfXEXKiagq1X8Lg4Aya8oG4 89Dw== X-Gm-Message-State: ABUngvdnFJUcia/QoStZ6Z25/OttwhqJuZihWHl4ACxYSw66RJUU8ILd8Q5DFcowL/Pu9g== X-Received: by 10.28.189.69 with SMTP id n66mr5773217wmf.35.1479246697268; Tue, 15 Nov 2016 13:51:37 -0800 (PST) Received: from [192.168.2.21] (p5B095CE1.dip0.t-ipconnect.de. [91.9.92.225]) by smtp.googlemail.com with ESMTPSA id e5sm6398601wma.12.2016.11.15.13.51.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Nov 2016 13:51:36 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <4954a807-8bbc-194e-3300-7768a56c6935@googlemail.com> Date: Tue, 15 Nov 2016 22:51:35 +0100 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] oggparsevp8: set need_context_update when changing codec id 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" Otherwise the codec context and codecpar might disagree on the codec id, triggering asserts in av_parser_parse2. Signed-off-by: Andreas Cadhalpun --- libavformat/oggparsevp8.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/oggparsevp8.c b/libavformat/oggparsevp8.c index c534ab1..86495ae 100644 --- a/libavformat/oggparsevp8.c +++ b/libavformat/oggparsevp8.c @@ -62,6 +62,7 @@ static int vp8_header(AVFormatContext *s, int idx) st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; st->codecpar->codec_id = AV_CODEC_ID_VP8; st->need_parsing = AVSTREAM_PARSE_HEADERS; + st->internal->need_context_update = 1; break; case 0x02: if (p[6] != 0x20)