From patchwork Sat Jun 13 15:05:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20330 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 3A180449DAA for ; Sat, 13 Jun 2020 18:05:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 169CC68B361; Sat, 13 Jun 2020 18:05:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C63BA68A9F0 for ; Sat, 13 Jun 2020 18:05:42 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id y18so4939115plr.4 for ; Sat, 13 Jun 2020 08:05:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=ZJMDYfDoxpSbMbkz49ML0sHJJ+eloNhnS1QokJ6PyJg=; b=gIXATj5JlRZPi4zlexksvWqLqVXwvww6vBsvpCFfOIYYONJFY+42XQllZBLxrSvTBi 8e85sYsEFTLK8aNWMMMMcRI3iqssJzvzu3BIaaAOzcCQMAcQK7lA+cGz/gsmw9RvTQr3 iA7HPhPIuwCkA9zrQdcVJmXeZrMhFAMB4QYDAmPE/0zDvuuvAyv+ucLBbhAJWE2x5/1z pi8vHe46r5fJY/jd2RA2QTpcWlxwaT00IYCI6nrtRVd1UV27YcXVOtSGM/AYLdfV08hQ dFC/L7edSD2avUBrcdqpyyDw9ASBCcTHC3wWFFELVAK6anyKd8DIIwENXgst/FRCdVEV VAdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=ZJMDYfDoxpSbMbkz49ML0sHJJ+eloNhnS1QokJ6PyJg=; b=G9CX2yDNzo5U4PXSUhYpGV13hmXcIEJqgmObsfpnQW5IBJPZd5WR064E/u6Wo8XKBb ePKWsLK+5F/Eau8vZclVC2xfIFgqkfcRWbJZEJemqGah5laMGdLevMR58KgJsaMTry4i EkxX7m+rpGBWZn9KmIhpyQqKk6FAVn6Yo//JVfUWEzU66JyFd/Axv/qg9UdjxOAyi+hB k+84zI5F9x4CgrYMR/iM9OpKbzK8B49bUNZEPCGlxFuRTZrQ0uq8klhhFew8TTfLfsjb AehRes5zBGneU/ElZPCEyCEq97csZBGdoE8Tdl0UDrzGpu7T4RLiHj1mpCg6EqhHryop vJNg== X-Gm-Message-State: AOAM5326bpeuA9pV6zo/8BABovaPgNbfkDuoykgo9+XyDewneOdhYcUk /vf+ARd7hhDyErYui/xQlMIFqOLS X-Google-Smtp-Source: ABdhPJwHtO4g1lmHbYbsv30Pjx4zIaY8UdP9pPenZLH20mQxFLSDx4gNBi5a9hPBCugOQhTJhgs7tA== X-Received: by 2002:a17:902:9346:: with SMTP id g6mr15432680plp.19.1592060740996; Sat, 13 Jun 2020 08:05:40 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id u61sm8168379pjb.7.2020.06.13.08.05.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jun 2020 08:05:40 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jun 2020 23:05:36 +0800 Message-Id: <1592060736-3496-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/4] swscale/utils: reindent 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libswscale/utils.c | 71 +++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index ff99e79..6e218ba 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1575,41 +1575,42 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, if (CONFIG_SWSCALE_ALPHA && isALPHA(srcFormat) && !isALPHA(dstFormat)) { enum AVPixelFormat tmpFormat = alphaless_fmt(srcFormat); - if (tmpFormat != AV_PIX_FMT_NONE && c->alphablend != SWS_ALPHA_BLEND_NONE) - if (!unscaled || - dstFormat != tmpFormat || - usesHFilter || usesVFilter || - c->srcRange != c->dstRange - ) { - c->cascaded_mainindex = 1; - ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, - srcW, srcH, tmpFormat, 64); - if (ret < 0) - return ret; - - c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat, - srcW, srcH, tmpFormat, - flags, c->param); - if (!c->cascaded_context[0]) - return -1; - c->cascaded_context[0]->alphablend = c->alphablend; - ret = sws_init_context(c->cascaded_context[0], NULL , NULL); - if (ret < 0) - return ret; - - c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat, - dstW, dstH, dstFormat, - flags, c->param); - if (!c->cascaded_context[1]) - return -1; - - c->cascaded_context[1]->srcRange = c->srcRange; - c->cascaded_context[1]->dstRange = c->dstRange; - ret = sws_init_context(c->cascaded_context[1], srcFilter , dstFilter); - if (ret < 0) - return ret; - - return 0; + if (tmpFormat != AV_PIX_FMT_NONE && c->alphablend != SWS_ALPHA_BLEND_NONE) { + if (!unscaled || + dstFormat != tmpFormat || + usesHFilter || usesVFilter || + c->srcRange != c->dstRange + ) { + c->cascaded_mainindex = 1; + ret = av_image_alloc(c->cascaded_tmp, c->cascaded_tmpStride, + srcW, srcH, tmpFormat, 64); + if (ret < 0) + return ret; + + c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat, + srcW, srcH, tmpFormat, + flags, c->param); + if (!c->cascaded_context[0]) + return -1; + c->cascaded_context[0]->alphablend = c->alphablend; + ret = sws_init_context(c->cascaded_context[0], NULL , NULL); + if (ret < 0) + return ret; + + c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat, + dstW, dstH, dstFormat, + flags, c->param); + if (!c->cascaded_context[1]) + return -1; + + c->cascaded_context[1]->srcRange = c->srcRange; + c->cascaded_context[1]->dstRange = c->dstRange; + ret = sws_init_context(c->cascaded_context[1], srcFilter , dstFilter); + if (ret < 0) + return ret; + + return 0; + } } } From patchwork Sat Jun 13 15:06:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20331 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 28A3A449F85 for ; Sat, 13 Jun 2020 18:06:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1052268B5C4; Sat, 13 Jun 2020 18:06:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EB2868B5C3 for ; Sat, 13 Jun 2020 18:06:15 +0300 (EEST) Received: by mail-pg1-f194.google.com with SMTP id u5so5538048pgn.5 for ; Sat, 13 Jun 2020 08:06:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=RgkzJ3ITb5ZI9SV1H6aNAlv3j2W9pimEOqFd11gNNOA=; b=iBcR/0a/c2aI8MaNzssqfiy21KAf2GbH3E01KuKGftfgHR+XSOGmbtUn+VGL/FxP5X jzvnkYJNOq0fYIfMd/Yrwwwge+dJu0i8aZOwIj5CuJiS6zTH7ezyrRBOluRoykYzRHaT ES1vnPKaVjJFqXtclOr4ufYMShTxxCWqvHYARrTID3obNXI3rj/FGZemPkRiC2/JG5Kc iGhG23y/R9E4fnIslkvgme/WOzKo2BODEwleXXdi1JFxafkfmQhWv2/Lo26qWgXqcRtm lPdXtmZSbe9eoge9zZSVhgxyh5N1Vw06IlUqsHge2VPkIEpXpx/S0UimmNCH/G5GEuzp 7dSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=RgkzJ3ITb5ZI9SV1H6aNAlv3j2W9pimEOqFd11gNNOA=; b=eBwnaXN0ELr6wnYrpm4nSBVykPy6rlR21Ejg8hm6owPuKIT2O9IEUS+9CfXtaQK0Sp 1ew6or7tWldQH67l8k035RTXwftZCLqqqOij1suBWaPjh9qOnXMkvoX6D970XT7jWjjD Cj3PLXYe0s6KZ2dGC9oYTJ1oYoIvMkG3vpBhQPQswIhd2E5CwSekgqfWyP5zsTFM+emq nCPySORnDKtTUWNBwXoWYYM0Vf5QVygU+Pa9SNiJGPJWYT2FdKijZOWbFQKy2HnhxU16 wNGH9nC/XCrhVUs9llYX3zQtHajMqkR1z+imYhZb3cjxxDkn2kO05InDQd4FFd1E+VlQ 3NMw== X-Gm-Message-State: AOAM533xT5ka9525nS8uWzLJ7iEmFwDvZkL+9zHCjgc59HA4OQdAkaPD kdNPdJN1QChmHH3KnaHVsvyL5a95 X-Google-Smtp-Source: ABdhPJxzUdCGiLdPKsXn0vP/cTCAgHSXYbqkDpXxIaf/ab4z+vLGir6sERgmyAfu1lwCgptkFuOtJw== X-Received: by 2002:a62:3806:: with SMTP id f6mr16263528pfa.102.1592060772404; Sat, 13 Jun 2020 08:06:12 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id h12sm8082199pgj.71.2020.06.13.08.06.11 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jun 2020 08:06:11 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jun 2020 23:06:06 +0800 Message-Id: <1592060766-3546-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 2/4] swscale/utils: return better error code from initFilter() 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libswscale/utils.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libswscale/utils.c b/libswscale/utils.c index 6e218ba..dcd1dba 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -612,7 +612,7 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, av_assert0(filterSize > 0); filter = av_malloc_array(dstW, filterSize * sizeof(*filter)); if (!filter) - goto fail; + goto nomem; if (filterSize >= MAX_FILTER_SIZE * 16 / ((flags & SWS_ACCURATE_RND) ? APCK_SIZE : 16)) { ret = RETCODE_USE_CASCADE; @@ -1491,7 +1491,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, srcW, srcH, tmpFmt, flags, NULL, NULL, c->param); if (!c->cascaded_context[0]) { - return -1; + return AVERROR(ENOMEM); } c->cascaded_context[1] = sws_getContext(srcW, srcH, tmpFmt, @@ -1499,7 +1499,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, flags, srcFilter, dstFilter, c->param); if (!c->cascaded_context[1]) - return -1; + return AVERROR(ENOMEM); c2 = c->cascaded_context[1]; c2->is_internal_gamma = 1; @@ -1512,10 +1512,10 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, // to properly create the gamma convert FilterDescriptor // we have to re-initialize it ff_free_filters(c2); - if (ff_init_filters(c2) < 0) { + if ((ret = ff_init_filters(c2)) < 0) { sws_freeContext(c2); c->cascaded_context[1] = NULL; - return -1; + return ret; } c->cascaded_context[2] = NULL; @@ -1529,7 +1529,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, dstW, dstH, dstFormat, flags, NULL, NULL, c->param); if (!c->cascaded_context[2]) - return -1; + return AVERROR(ENOMEM); } return 0; } @@ -1548,13 +1548,13 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, srcW, srcH, tmpFormat, flags, srcFilter, NULL, c->param); if (!c->cascaded_context[0]) - return -1; + return AVERROR(ENOMEM); c->cascaded_context[1] = sws_getContext(srcW, srcH, tmpFormat, dstW, dstH, dstFormat, flags, NULL, dstFilter, c->param); if (!c->cascaded_context[1]) - return -1; + return AVERROR(ENOMEM); return 0; } } @@ -1591,7 +1591,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, srcW, srcH, tmpFormat, flags, c->param); if (!c->cascaded_context[0]) - return -1; + return AVERROR(EINVAL); c->cascaded_context[0]->alphablend = c->alphablend; ret = sws_init_context(c->cascaded_context[0], NULL , NULL); if (ret < 0) @@ -1601,7 +1601,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, dstW, dstH, dstFormat, flags, c->param); if (!c->cascaded_context[1]) - return -1; + return AVERROR(EINVAL); c->cascaded_context[1]->srcRange = c->srcRange; c->cascaded_context[1]->dstRange = c->dstRange; @@ -1678,6 +1678,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, if ( mprotect(c->lumMmxextFilterCode, c->lumMmxextFilterCodeSize, PROT_EXEC | PROT_READ) == -1 || mprotect(c->chrMmxextFilterCode, c->chrMmxextFilterCodeSize, PROT_EXEC | PROT_READ) == -1) { av_log(c, AV_LOG_ERROR, "mprotect failed, cannot use fast bilinear scaler\n"); + ret = AVERROR(EINVAL); goto fail; } #endif @@ -1870,16 +1871,16 @@ fail: // FIXME replace things by appropriate error codes tmpW, tmpH, tmpFormat, flags, srcFilter, NULL, c->param); if (!c->cascaded_context[0]) - return -1; + return AVERROR(ENOMEM); c->cascaded_context[1] = sws_getContext(tmpW, tmpH, tmpFormat, dstW, dstH, dstFormat, flags, NULL, dstFilter, c->param); if (!c->cascaded_context[1]) - return -1; + return AVERROR(ENOMEM); return 0; } - return -1; + return ret; } SwsContext *sws_alloc_set_opts(int srcW, int srcH, enum AVPixelFormat srcFormat, From patchwork Sat Jun 13 15:00:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20329 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 CAC2844B037 for ; Sat, 13 Jun 2020 18:00:53 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A333E68B597; Sat, 13 Jun 2020 18:00:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F27DB68B27D for ; Sat, 13 Jun 2020 18:00:46 +0300 (EEST) Received: by mail-pl1-f193.google.com with SMTP id m7so4929403plt.5 for ; Sat, 13 Jun 2020 08:00:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YXo9UYYyuBzkmdT+rphjsjoRFsB6STLcohaGtmBb5N8=; b=VjOpj38PuiJ49VisLqxXhGQznh9fWusDgmEDV+v1pdAT3DhM/5JJivyOILz+L68UQ/ 53VBCpbaF4W9jgYHBAonNTQ2bPJrZX7hw1ieruzahnxcm3D5lRhLh0d2/xkOX2pYyWxy /qu84OS1KCCrtwW2ts5araLOfqex6XwuMO/cuPlivVmKyupLEQyyAuybHQvFp2obycdQ bmLjf5jjauvtsoxYM4VNK6W+/LN4o4IZ0R0V2A0BbAWxVcLAfSkqQj3YCP31bejaZGZG JhZRXZv8UG1VScTmTNOzz71dvrPGrYFaqm9/kiXJmMVKOuorziKVr5tLE0lo59VvtYe3 oYNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YXo9UYYyuBzkmdT+rphjsjoRFsB6STLcohaGtmBb5N8=; b=K68xuXiBiH/BOmmf4o+0WVf3261zyiwFEWhm3CXzdN/eB91yhUwcbIDSLMCUADaY5T /EMutsgTsQqWM3OJO7oDSKF7A7zoycsquvsqa9d5172GopnnrxUjA4/aSheaXMDh8VcP GA6xlEOYcMs8aYD38inqz21p95EEc/EDgyZtbGn0HhT0D3oshO08ed+pQwV2I1ydlsnf ZE0TGT8T43XZTBj8vSv52lXRAFupZZDSmgsaSnSUiiFITWcMEPFvIyK2F6A0ZoK56WT3 51JLwIuJ796pkyngHgTEkRQaUmaZCEfp/248sKYqI6FlDQrzwpU3ME5Z5pnw4cJSWfrj /I+A== X-Gm-Message-State: AOAM531fqB97dKcE2/Y67hwtC4Pgn/P0ruthqXDd0sKCQgETwy3odQu2 CZW/bj6uNlsvaJb7MSO7Bz+Fs7Lz X-Google-Smtp-Source: ABdhPJy5LQ5LTt2MA4XpJJHevMb4e28XGvMTsOZgzO0Xi+Dbgo4ee63vZxfzFcnxM/7FHGOIWPapuQ== X-Received: by 2002:a17:902:cb13:: with SMTP id c19mr14670180ply.51.1592060445157; Sat, 13 Jun 2020 08:00:45 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id r7sm8902550pfl.117.2020.06.13.08.00.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jun 2020 08:00:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jun 2020 23:00:29 +0800 Message-Id: <1592060430-3383-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1592060430-3383-1-git-send-email-lance.lmwang@gmail.com> References: <1592060430-3383-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mpegvideo: remove extra space 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/mpegvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 52a0ec3..c28d1ad 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1112,7 +1112,7 @@ void ff_mpv_common_end(MpegEncContext *s) int i; if (!s) - return ; + return; if (s->slice_context_count > 1) { for (i = 0; i < s->slice_context_count; i++) { From patchwork Sat Jun 13 15:06:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 20332 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 6108C449F85 for ; Sat, 13 Jun 2020 18:06:52 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 48F4568B5C6; Sat, 13 Jun 2020 18:06:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 476B868B361 for ; Sat, 13 Jun 2020 18:06:46 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id m2so5099253pjv.2 for ; Sat, 13 Jun 2020 08:06:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=gk85AAvxHd3oVSs1/d2J2k+nalKdQ0djTfiVa70mH0U=; b=vA8z5W0CBOkB9Wsb7uBxYPlXF9o0FAmtPzvqVMCY4NPgsKITTfPhDD1L/n8x4wbwA5 NudwCwzT/u517GqbHsKKYn58hS1Q/WkOoRqADz4LcjPufu940ISYQOxW7CfdFdgiJsEf t/Y2bkT6uHfn0kSBOesEt7y3fm5U8ClOZx3t2foQOccJw1JE+AtLm1/S5/1jzyw1BKLu 2+y5v8OIp4+daeOWykBtQrbFBdvmYB7XaQcghOLdt4p0yTgBoSAQ8vK9I/FAPhC1IQOn VHugcP+c9d8hqjeMgdelcmoYAwXdssItHeUBbAQBpUZ/mpdUcGnsL2pc2s9brdknoHhR UZAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=gk85AAvxHd3oVSs1/d2J2k+nalKdQ0djTfiVa70mH0U=; b=G+YXv2gyuqSR9r3cqLXbO40KVNyXSYbVncG4N6YzZhZSz5py2QF6BlXgJbruzjbGOE lCFlILamx9wnk2dS9eOKH5/vUa59YmbgIh1n+4HRdxCkPv/IXdsQkJVr0yZLLwiVPhXV IS6NrAjhwEnVyyGsDz5IlizMCS/VWYMOtuPG/IHxcgPUbBVykWxSYpaW3VYRhqQSWucj xces2AAPNXdebYdSVQ0QZNCKDVUnAfPXMQfNxw0RzGz0p2EHgYqlWQfktha+XCDkiT32 xWXTBK8x5MZLBYYY9qaODkagtTefGVfG7BZUjYH1HrOagqVyjW1tBH5LulRAvhnm7mDL lgbQ== X-Gm-Message-State: AOAM530KQDE2ku1sjgNX6gXHuuOjXzAtjF/WV3Gzj0hAS+lpz9p/j3QW LAIbPDNsdxycKPjQlFjQVkUcq586 X-Google-Smtp-Source: ABdhPJzurF+o/Uwo6oxn9lqKz0XAZ61Lb6emle2A6ymMDDVKJJ4iTJrpls5zEg2vTPVDfQzoLgDSRA== X-Received: by 2002:a17:90b:1244:: with SMTP id gx4mr3830038pjb.136.1592060804517; Sat, 13 Jun 2020 08:06:44 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n2sm9684718pfd.125.2020.06.13.08.06.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Jun 2020 08:06:43 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Jun 2020 23:06:39 +0800 Message-Id: <1592060799-3588-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/smvjpegdec: remove uninitialized ret 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/smvjpegdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 209f3ff..973a911 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -79,13 +79,12 @@ static av_cold int smvjpeg_decode_end(AVCodecContext *avctx) { SMVJpegDecodeContext *s = avctx->priv_data; MJpegDecodeContext *jpg = &s->jpg; - int ret; jpg->picture_ptr = NULL; av_frame_free(&s->picture[0]); av_frame_free(&s->picture[1]); avcodec_free_context(&s->avctx); - return ret; + return 0; } static av_cold int smvjpeg_decode_init(AVCodecContext *avctx)