From patchwork Thu Dec 6 14:26:41 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: 11305 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 149D744D020 for ; Thu, 6 Dec 2018 16:27:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B458368A80D; Thu, 6 Dec 2018 16:27:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9BCF68A7F3 for ; Thu, 6 Dec 2018 16:26:56 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id c14so721606wrr.0 for ; Thu, 06 Dec 2018 06:27:06 -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=fEyL4hgyTihZLAj3Mnp/T/Jxf5KahCkdBZpuuN62Yj0=; b=R/37uSXOVOpcAc7Hj8R9r3QPuD9XEglB3cpglfzDSTBCOj0GtiE3yq6SLGAn6BLgiK 0YH+B7NAN4nQag5mP7StlCO9tlwhiWgIwvzswEw6yitagVzgOMA2wian7oWwMliSVovP XPyc5IsHex+sFCzJHJC1cA89AWH31gPHjQpTgla5EwRga+p3mQHYvJLmYAenuHVWlBMZ It8K+Lynphzes0RvIRA7le34qUz1e3xZicoehOkX2Ulo59QLigHts5SWJYMQoH6XimT6 UbmHRnXqOi2y+bmIfJzJ1DIPWZy4qWpMIKfy+s6eLqodE+qDRryMqRxQHx2rEfLYk0/f 2MwA== 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=fEyL4hgyTihZLAj3Mnp/T/Jxf5KahCkdBZpuuN62Yj0=; b=YS4+kOfyklIWMlx5sVcSb4OCav7fhq8FcE1UMDP/LXn5iPWvAGgDU0PxRXrP5EsCRB i8kPbSSzh9SjUADOIWozMpk3TGId/D4AOQe8rCNYfHlwq/6LVTLK92UX7rvZUNtsa46l HjROBcZGhBWofDtfX95cRIJ3sJb7eLpqzJidZZ5jUrX8dHwmDWIv24vdGauLD+PFJNG2 uRwtDbktXFu9OaOyT6twLYnyePDi8eyrdHcrgYRDopdfy/2dB8d/IY+co8x01sy/ld1/ EEnMznu3NTfZkILIdZErtFpaXINYyYYF7Q2G0VBKxX6XQyEi7Kk0VV3NzaAkvV3z1Oyg SCSw== X-Gm-Message-State: AA+aEWZy8pMJVMmd3p+a9USFYh75OCMmczi+DhNBekjSQVTxTjYNfiz5 CJsdSBYO1NMtyTvMOhwHVRa266wy X-Google-Smtp-Source: AFSGD/V9I5JcoHCZx+2+I6Om43FbuphQRN8Jz+gFCasKub5y1UmBqm7o9qioFpTUVAAnk/w6IpnqTA== X-Received: by 2002:adf:8264:: with SMTP id 91mr24413331wrb.312.1544106425294; Thu, 06 Dec 2018 06:27:05 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l8sm268546wrr.60.2018.12.06.06.27.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Dec 2018 06:27:04 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 Dec 2018 15:26:41 +0100 Message-Id: <20181206142641.3441-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_refs: reset MMCO when invalid mmco code is found 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" This recovers state with #7374 linked sample. Work funded by Open Broadcast Systems. Signed-off-by: Paul B Mahol --- libavcodec/h264_refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index eaf965e43d..5645a203a7 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -718,6 +718,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) } break; case MMCO_RESET: + default: while (h->short_ref_count) { remove_short(h, h->short_ref[0]->frame_num, 0); } @@ -730,7 +731,6 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) for (j = 0; j < MAX_DELAYED_PIC_COUNT; j++) h->last_pocs[j] = INT_MIN; break; - default: assert(0); } }