From patchwork Fri Oct 14 07:33:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Zern X-Patchwork-Id: 999 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp98949vsd; Fri, 14 Oct 2016 00:34:04 -0700 (PDT) X-Received: by 10.194.64.36 with SMTP id l4mr1039157wjs.163.1476430444801; Fri, 14 Oct 2016 00:34:04 -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 h6si23495600wjo.22.2016.10.14.00.34.04; Fri, 14 Oct 2016 00:34:04 -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=@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 A2BBE689B0E; Fri, 14 Oct 2016 10:34:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 475FE687EEA for ; Fri, 14 Oct 2016 10:33:53 +0300 (EEST) Received: by mail-pf0-f181.google.com with SMTP id s8so46444560pfj.2 for ; Fri, 14 Oct 2016 00:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id; bh=0z0RFGubGDIzG9DtF4bp4T2a/tHMQxPBsr42ObEwcxc=; b=hHT+iTMnG/0G+A7H0sS+IaQF84IphgD6bEmJEsq5O0jl7BsNwVhddwyk/hGcPKUos/ /haFojvUnenyULlAupGhZYEwrbObrCmVzlI5UxFO+wqNJDXPea5iexmrbVWL++h+C0qB ZnkYbPyavrpIsTGICduC3di3JLu35BFv+qSPOWtManMaTJiOp3UQVOwiuLH0tY6cODzv MSrul8Z54V2XjUpN5zOLI4bE6dby72wYMBd6v630SrUk02BnASf2d2f50eSXfNv4VVAL 4bptVGqHfxa9vVgPNLoOA3KpbZAAOLGsZ8oKSiCUeVLu/wqYFn/zxFSOi4JWupRWRSaU DMAQ== 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:date:message-id; bh=0z0RFGubGDIzG9DtF4bp4T2a/tHMQxPBsr42ObEwcxc=; b=b8H+w/NARhPCHqFUU3jsYol4ZsNpaSie7Cim4gYhFT6E6TIs1g0qz5YNwbLmXU0o3g N99LEJNnEVvbfjJv5CrQ+uXsExWvw8m2QnWgGDDVPU6e4yYuz/r/Szw2pmywTOF+I/kH Fjikaf3lNrxlIP5QNAJTDx9IWuThZUgKnJckXNH+Ac+5wbJ0ou1Zs6L2miC5TW3itioq RbMMzOp+zwkzRnas5+ac7IJuRbePk4xxX/ziAuP2YysVUJe83g/FfoWq94NjCeSC6cBy FOqrXJSlVpaPmS4zD5hRfC0d7jBH8W2AokDLtNlDjagITfWFA9zCfgVSohXAHgFtrviL 5yaw== X-Gm-Message-State: AA6/9Rm7E8qMMm/SNNMj8ccdlcpMYuPXyrUgsHiVKfBnNIwCQXcTG53MWioqWBKhByoZDSz0 X-Received: by 10.99.126.11 with SMTP id z11mr13456234pgc.46.1476430432341; Fri, 14 Oct 2016 00:33:52 -0700 (PDT) Received: from jzern.mtv.corp.google.com ([172.22.112.200]) by smtp.gmail.com with ESMTPSA id q12sm2416828pfd.7.2016.10.14.00.33.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Oct 2016 00:33:51 -0700 (PDT) Received: by jzern.mtv.corp.google.com (Postfix, from userid 105886) id F289F8803B; Fri, 14 Oct 2016 00:33:50 -0700 (PDT) From: James Zern To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Oct 2016 00:33:50 -0700 Message-Id: <1476430430-96490-1-git-send-email-jzern@google.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Subject: [FFmpeg-devel] [PATCH] ffmpeg_cleanup: fix crash with unrecognized codec 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" since: 3e5e5bd Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc' Signed-off-by: James Zern --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 693981f..af8ed76 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -533,7 +533,7 @@ static void ffmpeg_cleanup(int ret) avcodec_free_context(&ost->enc_ctx); avcodec_parameters_free(&ost->ref_par); - while (av_fifo_size(ost->muxing_queue)) { + while (ost->muxing_queue && av_fifo_size(ost->muxing_queue)) { AVPacket pkt; av_fifo_generic_read(ost->muxing_queue, &pkt, sizeof(pkt), NULL); av_packet_unref(&pkt);