From patchwork Thu Apr 30 12:59:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19394 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 EE39544419E for ; Thu, 30 Apr 2020 15:59:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD90B68C6FF; Thu, 30 Apr 2020 15:59:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f65.google.com (mail-pj1-f65.google.com [209.85.216.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1367E68C6A6 for ; Thu, 30 Apr 2020 15:59:23 +0300 (EEST) Received: by mail-pj1-f65.google.com with SMTP id e6so658947pjt.4 for ; Thu, 30 Apr 2020 05:59:22 -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=WzCvlDtnDjiVc+4wjQm/rxqEmWPKhfmGLr1EM8F1YFI=; b=kKWw0UokeRT4jljKCUsATEficDj+XnZJLa8+08LbOFblqKXKL1MYdJiE8N45Xgx9Sz Jeb4L1/9Odm08isfWhoIwI7/kMu78J87Puj3jdDYPj/pqM1pyXVCJl7KA9Q7agG7jf+n oX49FixcuckvzmqwoUfV9tdPicnoZWlPx1hHe4NWnMB5MvzlhItsFpy+CBipYqmBCCkw JlnwK48Fp3H31sIzYDzd2Thg+BUrODjVj7PMov62/BPhy6huyjrIrzz+85V5rLMzgy3T gGU4baEH5K97zDaWLUGvaHOQEhprwhnW6z+SFQBzu6jYv8ieGgUHTdjr1bsewSZpFyA9 eJew== 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=WzCvlDtnDjiVc+4wjQm/rxqEmWPKhfmGLr1EM8F1YFI=; b=nSCuH7S6Y2eaBRtFAIUzCPH9TlPmA5F7Js5HQdAVITUKi/0AE1xMPPXf6xFl52O2me 3CAzQPbMNg2LMUa++0pzxNqIvewQ/5ZbFD2uIXCqM+NifD3iDphNiTpH1gsj7oZ3Xj7F zyoj1yANN1uOXAs0LIqOK4aEJTX4yUXIyCpajABeFP9hn3MgpDjqrtjen1qGxjO1Fa7k 4BYz0WybRzyqybkfhJ9cV+9qIMtlHg+wk+BkvDxyx2tVBp6z1y7RILLQU3dg59UYFvDV g/vcHCEgj4THxqwU9r7m8XvAiAQK1kSOsA33M2HqbhyvRQccqeUxJbMt+P01lBWkwwPX HkVQ== X-Gm-Message-State: AGi0PuaZ3rjT9RpKjXUZ+n214m1tOvbzvHA3nEktt+dzn1VBbaBpkRct aCKeh2UPZs0+sKkgnML31KdraPjN X-Google-Smtp-Source: APiQypK8HTgEu8CPkzzhvdOObYw64YMvyu4fnCVMVnNBLIOnNYOZPx+6ev9TMgH2BKmYMLmfthgilA== X-Received: by 2002:a17:902:8688:: with SMTP id g8mr3764696plo.268.1588251560618; Thu, 30 Apr 2020 05:59:20 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w13sm3416027pfn.192.2020.04.30.05.59.19 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2020 05:59:20 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 20:59:10 +0800 Message-Id: <1588251554-3665-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/v4l2_m2m_enc: reindent code 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/v4l2_m2m_enc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c index 8454e2326c..98b93c61af 100644 --- a/libavcodec/v4l2_m2m_enc.c +++ b/libavcodec/v4l2_m2m_enc.c @@ -204,11 +204,11 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) switch (avctx->codec_id) { case AV_CODEC_ID_H264: if (avctx->profile != FF_PROFILE_UNKNOWN) { - val = v4l2_h264_profile_from_ff(avctx->profile); - if (val < 0) - av_log(avctx, AV_LOG_WARNING, "h264 profile not found\n"); - else - v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile", 1); + val = v4l2_h264_profile_from_ff(avctx->profile); + if (val < 0) + av_log(avctx, AV_LOG_WARNING, "h264 profile not found\n"); + else + v4l2_set_ext_ctrl(s, MPEG_CID(H264_PROFILE), val, "h264 profile", 1); } qmin_cid = MPEG_CID(H264_MIN_QP); qmax_cid = MPEG_CID(H264_MAX_QP); @@ -217,11 +217,11 @@ static int v4l2_prepare_encoder(V4L2m2mContext *s) break; case AV_CODEC_ID_MPEG4: if (avctx->profile != FF_PROFILE_UNKNOWN) { - val = v4l2_mpeg4_profile_from_ff(avctx->profile); - if (val < 0) - av_log(avctx, AV_LOG_WARNING, "mpeg4 profile not found\n"); - else - v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile", 1); + val = v4l2_mpeg4_profile_from_ff(avctx->profile); + if (val < 0) + av_log(avctx, AV_LOG_WARNING, "mpeg4 profile not found\n"); + else + v4l2_set_ext_ctrl(s, MPEG_CID(MPEG4_PROFILE), val, "mpeg4 profile", 1); } qmin_cid = MPEG_CID(MPEG4_MIN_QP); qmax_cid = MPEG_CID(MPEG4_MAX_QP); From patchwork Thu Apr 30 12:59:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19395 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 1B13244419E for ; Thu, 30 Apr 2020 15:59:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02DE968C71E; Thu, 30 Apr 2020 15:59:32 +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 2082068C70C for ; Thu, 30 Apr 2020 15:59:24 +0300 (EEST) Received: by mail-pj1-f66.google.com with SMTP id a32so655690pje.5 for ; Thu, 30 Apr 2020 05:59:24 -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=mVCfngN2KKINcgn2bd7nwddSIDlWrI1+BnImcUAM9aw=; b=XSoiklEqmOQQyVdfrVRs1wBdnzdF9W2H5EvD1R+OiSQ0T6VbO9MYAgLsRmtaYCkiTt S+ByO8Ad386+0TV0JiSa0BZXRef/iHvPn+MsBnefa6uJj3t4+VIeLDLzDZg5KO62b0u3 j1VbMvWg5IShFFLG2wEqK91pabc+pxrbBZ20gs9tBhUdvH/f5E+FfcCogqje5c1hYkci iMJ+RRW35vqDltbetddApaq7840tMNK4k9eYkjMKt6UF3A4tsLAJWnQG0wB4AtKDMMzx ewwAsTL+xLpsqwV460ZODeFNh44TOvSh9xumlWaLTjB7l1gvciflrxM254wbEuGUp8Dw YYNg== 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=mVCfngN2KKINcgn2bd7nwddSIDlWrI1+BnImcUAM9aw=; b=nboqXVssxpH1xGiWJxfdEKSrfmuvigIIvxX1/dRaiFNUwmrXTxtFs9rXv0OZq01y6Z uPD5DRW7mnYCspbfWlacRhkiA+SHWxVa7ucQMhpuUshEtOxr7bMxb+C/k1aMVWolvTmj s5h3v4TpW+oWhLDUzcowCbExiacxGPjj37Adq42nUJr4R5Bz338r58PRf5GpomQ6SIwx UI3c2wA3Rseyg49PwIfLTal8QvaU68gtPjIy8lRHgFqQMh6/QYzX7zGNH441YcJrZh0f r8XceLO2z5RRRJtp3CsxoKjqTWkEGVkOy970mFe9XYFUkayYspyNzm6KJM6Vg/yK9TBg PpMQ== X-Gm-Message-State: AGi0PuZJ+EuFB2FVOy0Xt3Voq448e6MVlM2MfGU2W84wugi8bx1pYMuI xszvkxT0wbuCL3QRdp1WSpeieii6 X-Google-Smtp-Source: APiQypLZHi15r0I2M0L8kM82lg85RpKA9D5c5z6Ov96xbmhjlJdOAd8XK/NtkXQTjhsUxIDS64Cl/g== X-Received: by 2002:a17:902:6b48:: with SMTP id g8mr3408191plt.96.1588251562295; Thu, 30 Apr 2020 05:59:22 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w13sm3416027pfn.192.2020.04.30.05.59.20 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2020 05:59:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 20:59:11 +0800 Message-Id: <1588251554-3665-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588251554-3665-1-git-send-email-lance.lmwang@gmail.com> References: <1588251554-3665-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] avformat/mxfdec: reindent code 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 --- libavformat/mxfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index fdd0dd2a88..02a2a6d97a 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -363,7 +363,7 @@ static void mxf_free_metadataset(MXFMetadataSet **ctx, int freectx) break; } if (freectx) - av_freep(ctx); + av_freep(ctx); } static int64_t klv_decode_ber_length(AVIOContext *pb) From patchwork Thu Apr 30 12:59:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19396 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 1351644419E for ; Thu, 30 Apr 2020 15:59:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE50068C72E; Thu, 30 Apr 2020 15:59:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD50568C71C for ; Thu, 30 Apr 2020 15:59:25 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id s10so2228877plr.1 for ; Thu, 30 Apr 2020 05:59:25 -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=Ey84x3LzGH94aD4n1gPQjpk0uzEL7u7XV4fSgV8Xve4=; b=X+dd3o11CpIJrj2eO7AU5uZyf/iQDeTpRcEEWY5DMKHvf58zfNYkwJzzTAqWDFYgjh aTX0OExqh4LioM3+IQnm4KuXWILthdEohX37i1hZyiOhY4QuPyJX88vDZQuvZe1fx1zO 5f/7Zk+8tQsJEAZfc0X/Yn8fFpJZmT9DkBUxKpiOhz0BAtjlfl0s4sYUkSS1APC1eoPz XTbpStapKOeOzhZSuMA5+148vV0F9dKFeDl5ciuDXnWgL7cSXy9Fw1VRnPR5U1SVxL3/ 6CUJXDJcXK47MsFHQFjUvY3XO6+WAbFQXi2lllGzpzUG0AvRh6LJJTElNGTqo085tOoe 7VoQ== 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=Ey84x3LzGH94aD4n1gPQjpk0uzEL7u7XV4fSgV8Xve4=; b=VBcUOuCeoIpCfpOYWmZmAeCX7RkpuHCF3CTRI8YF2G6FK+pX1cXDCl7DvFqj8C1ElN AaokIGBah46P/A267ejKjdCN6PrSgrUwulaI1pzCLZnCC04ygsRUG1U9x5jy+5mHKPoz +pq+y5x4q7Ls8Xk4I52W/zyIGmCH2ZoarSj69d8XszHhpG/bqCZZjM+tq6Ow9kIQdebd a1QbKqAFyMJpyBa+h7tKGpEEisz14fEPYdfGfIXM+0WyVwXyhM5PZIOthPuUVE8doGoW GF7j4QKUhRM9Vk2xiCaM/K2JF+nSeHB8aOtMAocBZVbhyDhDJiCoDJpgaLbgCoDc7Udw khTQ== X-Gm-Message-State: AGi0PubzSFdoFgk9FTNE/U8lNtfw6w4VOxRWZ5rwPWLEgCpxLDBLWV2H EgP1FydJRr2eWzCjQjU5F16OYhkX X-Google-Smtp-Source: APiQypLnnqQ12YnCZMpipSDUiud095dNZIrx6W5cGdYmdRoetDdDLbSlx6t12H5xl2tbTrSKHpDc5A== X-Received: by 2002:a17:902:8bca:: with SMTP id r10mr3473170plo.225.1588251563852; Thu, 30 Apr 2020 05:59:23 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w13sm3416027pfn.192.2020.04.30.05.59.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2020 05:59:23 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 20:59:12 +0800 Message-Id: <1588251554-3665-3-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588251554-3665-1-git-send-email-lance.lmwang@gmail.com> References: <1588251554-3665-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avformat/mov: fix av_freep for dovi pointer 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 --- libavformat/mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 3d6fef685d..03c8801402 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -6827,7 +6827,7 @@ static int mov_read_dvcc_dvvc(MOVContext *c, AVIOContext *pb, MOVAtom atom) ret = av_stream_add_side_data(st, AV_PKT_DATA_DOVI_CONF, (uint8_t *)dovi, dovi_size); if (ret < 0) { - av_freep(dovi); + av_freep(&dovi); return ret; } From patchwork Thu Apr 30 12:59:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19397 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 0A0F244419E for ; Thu, 30 Apr 2020 15:59:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAC8568C734; Thu, 30 Apr 2020 15:59:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7293368C729 for ; Thu, 30 Apr 2020 15:59:27 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id y25so2837286pfn.5 for ; Thu, 30 Apr 2020 05:59:27 -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=dlDSZs5a4fz35KsKAInLYlkuTDZC+KPBhhNtBXgKGJA=; b=dcdl/H9x0fKuDLAGdEChqoleKnXo+uQCSbgOIJ9byXi4rjeChchvkl4Xle4Lqmwmyb Pu/6IKkGPXP1lFCI3u21xa9FITCn+rWF7j4N1MiTmu85zPMRonytfk7g1x/Z5cTLmJVY XZ7BTg/oyS1X/R09sDXcSMSt+4Mf05bBpzXlQvqy72f+yuXp+uDwHziD8HD3vlyjNgut 6BVQQlZH+JYlL/itzAA7MhsBRq14XLBEP4nsRfGduIaKVMYhJEE0BDsrsjl1cuwVz3J3 8qZH51EMPy9m2ZqolmkIKXFMCMVy8zp271ZOi0nAaah04qdD069SsxovHQ5k9QodJMvi XPiQ== 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=dlDSZs5a4fz35KsKAInLYlkuTDZC+KPBhhNtBXgKGJA=; b=Ovnzb9P6BxcoSnPOJVVhGCygEdi9/4I9l5z7DQyj1GzKWbYow/ZOp2LEYMXtdBPic/ QwUyhW1Pt9te1rTZH+9UjKSII5BC1jumwk/H3QO54fUhCk+dRmFcXEAS9A7S1kilKf8R ilWOGkX8RjaNiL53Wo1gqPp+pCk53j6KBLp5zeBardug3f//wOIkzPuz+KRDjP5vLEbE D4nssJc7YO6zsloDHl67j9zuZRzenWLW7OoVnT6AarTU8bxlvA61BV/rhE9tiGS3g9A9 kGmpMbtEz8YyBPnGK5r0HqyUDu6MlidIhOX2BeRnb1+W5YyNjRH4Dyb4ivQqrRu35snM x7hA== X-Gm-Message-State: AGi0PubGTMA8y8wn2c5Y+gmWvnynjN4lm5m7UroA7tZTkSaDF28/lyo6 pMypEEdA2le80U1PUOSbvUp9Q+k5 X-Google-Smtp-Source: APiQypKWNMBc7rTYJBkriHCdfp4o15Tob0zkKicSSGFdRj6Mw8C8S3kFgOw2d9LqptgxBMiArb7s9A== X-Received: by 2002:a63:b557:: with SMTP id u23mr3163058pgo.160.1588251565524; Thu, 30 Apr 2020 05:59:25 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w13sm3416027pfn.192.2020.04.30.05.59.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2020 05:59:25 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 20:59:13 +0800 Message-Id: <1588251554-3665-4-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588251554-3665-1-git-send-email-lance.lmwang@gmail.com> References: <1588251554-3665-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] avformat/mpegts: fix av_freep for dovi pointer 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 --- libavformat/mpegts.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index ff3898c3a5..3bd98e5743 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2180,7 +2180,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type ret = av_stream_add_side_data(st, AV_PKT_DATA_DOVI_CONF, (uint8_t *)dovi, dovi_size); if (ret < 0) { - av_freep(dovi); + av_freep(&dovi); return ret; } From patchwork Thu Apr 30 12:59:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19398 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 1ABB444419E for ; Thu, 30 Apr 2020 15:59:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 03B0C68C73D; Thu, 30 Apr 2020 15:59:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11C9568C733 for ; Thu, 30 Apr 2020 15:59:29 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id a31so666383pje.1 for ; Thu, 30 Apr 2020 05:59:28 -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=G4bhzG6Uz1kT1HHStCiLMcrdEJ22+CNEF6X2RN3iI7U=; b=cctTJGKAluMUR22YcfxtO56cBna2R1XsTUXNk3stTvuptwyTHvYo6gyM6FSU6que0F MpYNhnwGZ2Kv4A2DQWi8w37HzLsypD86ibtU7UrN4/9a1jfWDcGkQRe0jXlMnu/UdkRN lSw7yMdOu6QJAr0Klvmgg5K2+HKu104qs+d3Rk8qYi2kFjWhtKkK/t4eh6ZXIq3I5MqU HgJ+i59GzgGQSNfp0tjYyNwZ41I5BnTkjuBtrDamUZI2sWvTB8ImTohudJt1Izv+sQX1 W1mka8uO6ihbuSAGIuiQK15GIGP+1CQM6jJI919e0B2lwNfAIi7reGXTOOVShk2Y9NdQ 6J/Q== 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=G4bhzG6Uz1kT1HHStCiLMcrdEJ22+CNEF6X2RN3iI7U=; b=Rrec7MzaeL4nomInIZTw9uoqxh9/z79OMwCgKQKUGgVMz3Hfzcr5pnXQdETHijsn+Y fMrQyCOEav9bOFlKV2La19m6wHilryt1Y65DogysPkZfov1R3YNUefLs9l0pk4/j4QYh MdyfI6d04BGrnNT9NGCjVmTEGWuC5P58kmhN71XE880Amr6Ct5MQvDe5JvbR8eJGp4GL kX9AyNZA3R7DaFl249ZA5ccq9kX8c4KFm8rkorYMm0O896a/R12KRyoo0SSKQ9OSXM5i Ozvapi/aqaD8Au+GlCGgH/mEZxEYRSPMQzZuMWGPk0d++ciXHcwBAsAUBPV/5biHMwjT OfPQ== X-Gm-Message-State: AGi0PuYlvO2QmGMKNadeiGDhzhr6OuYf8Uuqj2kdga/1pR/9PAHh8/vc GF8wr8sOsnJj0fDTYncxyDUNbvwz X-Google-Smtp-Source: APiQypK18sDazWZpGayeY7GygnhWheCafE1Z0C38Cir1XJm51We6XG91QiFvZalvm9Sb0Hv95tPJsw== X-Received: by 2002:a17:90a:31c2:: with SMTP id j2mr2841206pjf.17.1588251567065; Thu, 30 Apr 2020 05:59:27 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id w13sm3416027pfn.192.2020.04.30.05.59.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2020 05:59:26 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 20:59:14 +0800 Message-Id: <1588251554-3665-5-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588251554-3665-1-git-send-email-lance.lmwang@gmail.com> References: <1588251554-3665-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] avcodec/utils: simplify, remove duplicate code 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/utils.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e77090daef..91b271a717 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -584,37 +584,14 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code avctx->internal = avci; avci->to_free = av_frame_alloc(); - if (!avci->to_free) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - avci->compat_decode_frame = av_frame_alloc(); - if (!avci->compat_decode_frame) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - avci->buffer_frame = av_frame_alloc(); - if (!avci->buffer_frame) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - avci->buffer_pkt = av_packet_alloc(); - if (!avci->buffer_pkt) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - avci->ds.in_pkt = av_packet_alloc(); - if (!avci->ds.in_pkt) { - ret = AVERROR(ENOMEM); - goto free_and_end; - } - avci->last_pkt_props = av_packet_alloc(); - if (!avci->last_pkt_props) { + if (!avci->to_free || !avci->compat_decode_frame || + !avci->buffer_frame || !avci->buffer_pkt || + !avci->ds.in_pkt || !avci->last_pkt_props) { ret = AVERROR(ENOMEM); goto free_and_end; }