From patchwork Mon Dec 13 01:38:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 32363 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp4814651iog; Sun, 12 Dec 2021 17:38:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJxMPC8Ne82BAdwOLNQ+WPBGo4ewxioW1ttqFiiOcqDKFj7SxT040Ntn/LtO6mcNo4xo4EhA X-Received: by 2002:a50:ce4a:: with SMTP id k10mr60516763edj.31.1639359538062; Sun, 12 Dec 2021 17:38:58 -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 m10si19453951edc.241.2021.12.12.17.38.57; Sun, 12 Dec 2021 17:38:58 -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=@outlook.com header.s=selector1 header.b=siFzCX4U; arc=fail (body hash mismatch); 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B44F068ADF6; Mon, 13 Dec 2021 03:38:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073074.outbound.protection.outlook.com [40.92.73.74]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF7AC68A865 for ; Mon, 13 Dec 2021 03:38:45 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eudbte/2cL2/qCtRWczqV6fYRsmPLQd00XDPbStdu3EEVfEpdrTGLMnzoCuhDq5THHGNdTtzPfKkZarCrFHOfGLBbyeQlIDUC5n/xD1TCNH/kvypi/h3bEbLxlbnrs5A/eGR1SH7xMxVi4rk7L4/xBVQkY11fRm8grSDCyo5TXS4mxmKx4CH9lMPV3929Ivnpp3BC1UBQJdfTyEaEFjbhCtFiblVNoOkVDT1YXOxxUvG7M3l/QG8KtLISk3FJLGew2wCJsY2pk2zw0S8gJP2/DrkMTWHxWoLPPRt2VnvUg0WX8NTUsyvBB6ZzIvMq10SJG0RWl3LZCrzqypn4TSylw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ubePYN1hRinsdZYxGbSrgEWYHQFIs8RECEidVAfi4gk=; b=Fo/wcnhaDQ272SW8C9EbhqUBH/rnYYGxai94MaS44WIxXb2Fn2dGRCuSfsyX5Z/wL2eCu6Zqj08Fb9iJQu6OlE23hfCQ7HSZVbPhJDPOU+uCLDzzlx6BtQxqZfRV8plrnOXCgLSG+a/+e2IvvNGQ6oypNv15mSkMy/nn2w+aZ7cf8eufFZ4um+V8C9IkX4DUZg36VIc5IdaQKMFbSKeOEe0s2I7hd82KS5XUsk23cEieD1GLkShjI5CW2jFZ8XHgnPUrTvYwWk3OS4u4C61Hu9YT32I+NVT9M0G9je0dZNyvpt+ZtB24yq4KClGYcvBrt8c+HZxMGx+Ko/GOpI/pMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ubePYN1hRinsdZYxGbSrgEWYHQFIs8RECEidVAfi4gk=; b=siFzCX4UfJUc7Ubrypa67PoIYa197HdHhBrIUJtosaUHJ8CPF5YeRQtfgYkPqjObh/zs44o4lmDum4CvZ/+pIwocWYXkeIpEs88Eo6hXqWwy926M40KesJuAPHXiweWvnqJMlxm6nrrrSc+Y2VgDXEYi74xBYPGV8YCey58k54PWZSp7Zt2261KR7dX33K3btlYw0x/ac74Ak4Rlbv4yZbO4O3KZ2uBPi+qP0fEnjzb89wTcYCgkqY2Bct+FXalg0xeTsrOXud/72fLtIySMSShby5IE1kcHsX4/hqCFWm0pukKg5Tckf25zbYvJK4JzlMV0RyzB6H8ifBaisPBmQQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB3864.eurprd03.prod.outlook.com (2603:10a6:20b:1c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16; Mon, 13 Dec 2021 01:38:44 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%6]) with mapi id 15.20.4778.017; Mon, 13 Dec 2021 01:38:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Dec 2021 02:38:25 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [XX62MOmHEZmSR5hsYLSlnizKnIVb5Ero] X-ClientProxiedBy: AM6P193CA0097.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:88::38) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211213013829.1749956-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ee13dfd8-b183-49cb-ffdb-08d9bdd94cc6 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRhTeYa9y1Ya0aPjwWbsts1BdCSigKZtSlRtGDy2j8fotXfTC/iwDD4p+f8C1KgbS96RsKCM/QW1FAbFJjjEdmA/f7YVL72+xCYQkn/ePnqSNQgnM2MKYIkm5/lV7e8PECMRJfXHUFvcjBjSxlA1pJEZKaCAmrLdVOIx1eLmjeAGPCk4W9CnUJZXpkOKcHvqP+IqrpNzE8ekcZAcedDPZA/1aG/LJtGbFCO1vlUUy56cgrgEcJn2Yj8zaeIQDnr0uBWIIdzDGC5qCSh2wVTnAyu38YnwmUeAwCw1qFvUiSmwgZPj6kSRWG/sRsn1DOcgPEyaDsiblwnvLmAKY02y3lix4ihxgKj9aWsgsnipiAZvsaniq8noeLcooL7rR/mJARypmH36AAEKg3J9EM+ZHy4ng2tv+8JOKNcTzPhLeMvSkNhHY4TsicaMHWwwPXEsGGdLBUtzhX9WPldw2eLE7qpZ/ySSz413oZK/yVFYPqOA3/L6dIdqIh9VtyMlewbIRCiRMsI37YeyyFqQz+6O39bT6XIMK2L9VVK4aqZvCNkM2ANUPcXLubBz/tUdxCj3f7i/kzxWZ327bs8a8/g1Zwe9cZ6tSsyWGOLYaWXPuqMg7WhM++XeD7ucCXQFLsyy9c+idgR7aDeyWm0WLc06gEpCPhbTMXCh9s8l+ATydLC9oBwWkNf0ENqf7/eNIpUCURXtn0AH0KF144sXyVdJeRH1Pc2t70E1zc9Orx1zJn4maVaDBQvnieoUTfel4C5KUM= X-MS-TrafficTypeDiagnostic: AM6PR03MB3864:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hWrJtojh7/dJb984wsS4EQv6zVmPa/Rx79a9TFNTCag8WoI+D3h3jXXynnL/PEqB/27FpOYNzz48HrvpyOw4Gc58obC4k+5QADKWTmU0erG/uDkkqOjJNaVGb7GwSWvjdHN3JRt8RDLbiLFPjzZwab/zmhC17hNPZLTScMaVXyDRSWifykGsfTyYrnhPi7bsk/oDn5Xci8OPJEmMFgOfrKGeruSp0zilDaV2THjMZGWrBXSPxU0KE10nOXu6sSOSFg1L/1dQ3L6NGRgW2YR3Q0HChgZf0xhzpVOolprPcYwqRIwNo4MRiRvaQBXzl578PGgj3uH8ihWx6GSZf+bP5fUKFH0yAEvVGoDdZklLc5ohb6878HSrQWsz6/9/G45ZHJg+mOLnkau/ISIj0ec8b4Ss/8VPbJ5rT/Ggc9seD2l/39OZwmrUNW5t7fI57R10pXFXW/1T64HM4weXQ7SlN6dAlP0OfNeREnO10RcZDqqm7k3bi1r5NtXfPu+kPoVDABW8oO3AM8MyBNw8XUDsZcBQT8WA/dJV7peVzELIghwAJCd+IiRf8nWL0VjoBCv5BMvH7RCRAYZbunMiqk6jpw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qNcaikjdPkw8wYXrQhutXsGfS6laXndrjarTl3B3Z5eAKABOyCBsrRK0/lEUl7V2YAahF43mLtr81MVKfFaWRh9BvTmDqEqFzNej08y+RhSQ6QE0poqf0Alj+WE8TXzq1Vioic3jAvGeZKhoqPf7BiMrBWDrxvAMLD8Ibq23UcP/9NhnLqLUyxxwfNAJOqU8/8CfiTRU1+a8qUIhJ6tgRnP5aSFIg3uTJuv8LhMF5LzRjFJvNlNbRxcvR8NqWvGv66ug0gLb+xZHutFgXuq4HgzCVEWYBNCjWGLOfA3trOQMw5nLPM0bDQ2qLjubzvc6uFANzL1dmsZytUhlpDkjhKfIRNMjmbYo/VYHSO4Ax06aTfOwSJdfDwcrBnRXvhmwa7u5PU9ZmEylh17x0ixWAM4HM3F1PZOxRQlYjZdTnGIg2Aa8CAgjgtBsEkVCuRlPe1pKxA5eUAqTMq221aUFqZgtTCABhL62C+8F80ZzRnSFUualHOFLLb/dw7oeFzttCAQcevVrmcHCoOeGV/E0h6E5KNOmSGf6pcNGIboX5k05cT+dXE5+TVOylRKa8mFzCCzpTp5Dj6ERJrEwbGPF5UnYjsC41xYeprehCEneYyqmzy09461xp0xm1J/aj3hlvQUlCHvgpmcapri/MJ0SWDmYtAUDfYxoA71bOcUzzre07em3cPdTcLiVRLcCVfUNC5c6ykcSj9ZDNBlF+lxUvd1nnxkx/ExXf99gjQ+lT0X2INWnOkQ5Omx9HYtZo55KpIN9lg65SMXvZD7be8hQt2dUKWKYP/7a1Uz6v47e9NPYhGPf0zzJ/iAiQ5UNJgEjyBqxlIEH2JBra6lP9cEppTzw2qb4k5X8tqRpg1EAhmCQEVsXHNvnFSXlAVFNn5aAevhtxe0eKAa8+Yus9WjZvi1H/7JEmtGLt3mefSjUIWoymc1mle/tkk+3kFHyimPGyFMFg+LYVzPZSjQs3DooCw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee13dfd8-b183-49cb-ffdb-08d9bdd94cc6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 01:38:44.5017 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB3864 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/mpegvideo_end, vc1dec: Remove always-false check 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IqS6v+Io7Zil Mpeg1EncContext.droppable is only nonzero for the FLV decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 3 +-- libavcodec/vc1dec.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index f804b8215d..d33cf9477d 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1658,8 +1658,7 @@ static int frame_start(MpegEncContext *s) if (s->pict_type != AV_PICTURE_TYPE_B) { s->last_picture_ptr = s->next_picture_ptr; - if (!s->droppable) - s->next_picture_ptr = s->current_picture_ptr; + s->next_picture_ptr = s->current_picture_ptr; } if (s->last_picture_ptr) { diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index e636fa6160..267d72d15b 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -862,7 +862,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, s->current_picture.f->key_frame = s->pict_type == AV_PICTURE_TYPE_I; /* skip B-frames if we don't have reference frames */ - if (!s->last_picture_ptr && (s->pict_type == AV_PICTURE_TYPE_B || s->droppable)) { + if (!s->last_picture_ptr && s->pict_type == AV_PICTURE_TYPE_B) { av_log(v->s.avctx, AV_LOG_DEBUG, "Skipping B frame without reference frames\n"); goto end; }