From patchwork Sun May 30 18:02:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27988 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2253545iof; Sun, 30 May 2021 11:04:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCMqZI9Acq61yTl6O6XIuSVoiac91LcqLdwHwDO9Uc4TS7617tjmGMfCtjBOK4AqFgzPG7 X-Received: by 2002:a17:906:40ca:: with SMTP id a10mr415227ejk.181.1622397859804; Sun, 30 May 2021 11:04:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622397859; cv=none; d=google.com; s=arc-20160816; b=gkrtfiTjF6iqJ6crl8+K8oD6a7gI/EfCGuGv9f0ussNPnq0PMBxlRNKpvfRQ+2/IUJ 3vOtoBFYkwWy9mFZOI+ILqmULdjXUFygwXYdv1GlJXZxT46QTX4i40bJT31jAtejzN9g bmrLOR8j5sIRjYOitl5Ya0P8E93AKclW9zSPl4Idw6DFins4rGOWFGrmH5HyRjPF05Sy r0wurLJY2Vug9vSin/V/wCgE9wwNWcbndk3SaelCyRrzY1eElc7MRdFwlVvJzc2W/U1H gPpHycHyekq7RL1WrX1bB7EG4Q/M1zg7wu+MEXyHQRFNpQltblnMrNgN2dEM3D9+b2ML Y0Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=GQ7XtHx7zByOZ8KuQ3FvCnHbNjKvx4zgit61IWujj8k=; b=JA/d6l6viYTJAus4bbfOZx/wrOZ7SUJCo+e9ZD9EvRH8cZs7Omwkoj5Q5eaT3UkSw3 KK7Hr0WM7/LueoCoEcn1oQGtvtziVtybU7mMeAp2fHitvIvhEIu/SCDsGrFZBh+jNN+P o90iYL0mnswoVP8tyu5cEvZUrgbAz8FZ3T2g2wNkETl6wwg4fkEGwlIchK0YNrJZ8LdO S0qplZ6nO6f2JUS5XV0hcvbunPZVnHIZP8lcxdI2RVTnu/+lzo4PuxufO1YLNtuK/E+W dDVqqAizVwOZ7hnZJRu/cmsLX4CAiwiZr3JBMT916LJ9z9FocFsyosMihtVhMp2HGrB3 6QLw== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id da23si9794777edb.544.2021.05.30.11.04.19; Sun, 30 May 2021 11:04:19 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F4C8680BBE; Sun, 30 May 2021 21:04:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-1.mx.upcmail.net (vie01a-dmta-pe06-1.mx.upcmail.net [84.116.36.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A98EC680836 for ; Sun, 30 May 2021 21:03:56 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lnPn2-00EbQl-0E for ffmpeg-devel@ffmpeg.org; Sun, 30 May 2021 20:03:56 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id nPm4lulyxljeHnPm4lXGHT; Sun, 30 May 2021 20:02:56 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=wV1kizpGF6HBhSMcU0kA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 30 May 2021 20:02:55 +0200 Message-Id: <20210530180255.23554-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210530180255.23554-1-michael@niedermayer.cc> References: <20210530180255.23554-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGB3r9FcBfCWFao54JcToCzCDHPAZTjzOUHI8n6Rja8Q+CEfn47H6wVYULwUz1nN25Y3fq/C/XH9wz6l1ZKhqbDiMXkiUSde+z0czDgUoaqPT9KYtI2t /uv/Jsn/7Ln7HvLT/Neu3nHuomeclHvWA1NaJQDjmB526Gj6Cao0sZWN Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/mpegvideo_enc: Reset stuffing bits if they are not supported X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Ww9aU1VVdtok Fixes: Assertion failure Fixes: Ticket8202 Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo_enc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 13618394a5..38dde3702a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1850,6 +1850,7 @@ vbv_retry: break; default: av_log(avctx, AV_LOG_ERROR, "vbv buffer overflow\n"); + s->stuffing_bits = 0; } flush_put_bits(&s->pb); s->frame_bits = put_bits_count(&s->pb);