From patchwork Thu Sep 10 21:48:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22265 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 1955D4491AA for ; Fri, 11 Sep 2020 00:49:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F0E7E68B9E3; Fri, 11 Sep 2020 00:49:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF9FF68B821 for ; Fri, 11 Sep 2020 00:49:52 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id a65so2101432wme.5 for ; Thu, 10 Sep 2020 14:49:52 -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:mime-version :content-transfer-encoding; bh=VBrpRkIOGx5SXjyFFTcL2d/ArDgaI547vSWVKzSMJi0=; b=EESbsauhoEN+OKdF4oOA93RH6PjcrlVH+71jFF0Kqh6xvbldg4blGHYTIOOJfjU3FY RrXTiurRI2CTB8ge/XPHRkd4V1rzkzQioXAbbiUtnmKF9udQ3nuTTZzF2Sy0d+/DwGI7 FTVqn8+AXjBzJrgqEW8MeMeAPL9dQ+GfEKdEQ7+5JU63VEI3QUpqjktxPqvzp8buUw6H wa15bXR6m6ZHkSkwMU+pfHpABNSZ/bGdFglV/uVo4pTBWf44ZUT9pAqbAQkDWaRdp49f Omnmtruwcu3RoNECErkNSJRlDpIDm/EIBekiFWoxnxkyhktUrPDZSkkmaIVuC8kIK6sv 0s/w== 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:mime-version :content-transfer-encoding; bh=VBrpRkIOGx5SXjyFFTcL2d/ArDgaI547vSWVKzSMJi0=; b=fw7pgkCh5FvJsJoGyw/8CX23PEGkVlNNjR8rM6x8XgArLj0rVHh5pQY7ayXaS+GhF7 lhoSWYZ1jamDzzG2m+oP+KBrlIYLxQutliI7WomHBF7/8nVNMt9Gy/mixIntPv+s5v9E BGMcuW8T8uPxnj27kxgppDGD3trvA2upap2HR0vCVBEB/2/w9aUFPDAgttIyCx1FoboN cCi6NKw+NfvkALU1sybI9UVKJPy+0+5z8kJhavi84g8D+8zVwVBpIHU/PmNNOKjm+50b PR/a1La1SANbIIyfmxIeSzy7pvAOcuwYdulvbSbyEqfbDseAcdRYo59XBwJQIdkZIRl3 qzxQ== X-Gm-Message-State: AOAM533uOHG9b1obBBp9fhpApTD17kT18ppE5I9soJPBGWs/EWB4zJvu gLepNjewO2h4p2dppegKt3YtytvbXOU= X-Google-Smtp-Source: ABdhPJxOAt+ucZbZnejlupCGXGg+B2kCCxRniJtWm2uv0udI0jIG1fCMqvC2OUnvp5ZNNWnl6hExow== X-Received: by 2002:a1c:c90d:: with SMTP id f13mr2056983wmb.25.1599774591972; Thu, 10 Sep 2020 14:49:51 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:49:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:48:53 +0200 Message-Id: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/9] avfilter/lavfutils: Don't use uninitialized pointers for freeing 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Happened on several error conditions, e.g. if there is just no decoder for the format (like with svg images). Signed-off-by: Andreas Rheinhardt --- libavfilter/lavfutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index db4b69b9f3..84dd4c0704 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -28,9 +28,9 @@ int ff_load_image(uint8_t *data[4], int linesize[4], AVInputFormat *iformat = NULL; AVFormatContext *format_ctx = NULL; AVCodec *codec; - AVCodecContext *codec_ctx; + AVCodecContext *codec_ctx = NULL; AVCodecParameters *par; - AVFrame *frame; + AVFrame *frame = NULL; int frame_decoded, ret = 0; AVPacket pkt; AVDictionary *opt=NULL; From patchwork Thu Sep 10 21:48:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22266 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 4C5D944B1C3 for ; Fri, 11 Sep 2020 00:51:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 31DD268B9E7; Fri, 11 Sep 2020 00:51:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16D9268065D for ; Fri, 11 Sep 2020 00:51:24 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id g4so8931492wrs.5 for ; Thu, 10 Sep 2020 14:51: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 :mime-version:content-transfer-encoding; bh=a7ZoKy6NzD3C/7GR8lYwPcBa8zSEmjBwXePTbFL7pZc=; b=fOyzoNXoWSaWULXKnF8muUagw8hlw2DHlQt0yQ8GD0GpnRbda6tDKnTo4ZoI0R1gP8 GUyqlGITEIzcYEYxuMkzJrKA1XO4xHM4jFXh9w/Dh+aFJMFNHaXMDeha8kYXyClrbSY8 ivQeb9OxDT7yOk4k+4Hwh+1baak925f45YCYJsxq67oYR9zeBSRKrHGzMGIBcI5D2x2m 7nCHzsO3nH1k//Nvbz88+aGy74DBulGC8/CsjrfJyQZuTPLRjJhF52AM20miZxixJ7Mo MFMgDOfSh23BPeGi7zmMNG65Iki6OhgB4bNLqYKkvqzYBA9fBda7M5NYKEqePePJYsb0 5aXA== 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:mime-version:content-transfer-encoding; bh=a7ZoKy6NzD3C/7GR8lYwPcBa8zSEmjBwXePTbFL7pZc=; b=hyO4pcwtcycyzVBUINAnByoKHdD9Cc9vVXQIGJDJ80c1nu4vPRS0WsiZEEOpGs2S36 XYsUt+8KHoyLOvnpNQD3WYbQ2bq+K7Z0bl0C5kNG/UIOOPKNBALCFrdaeQhVTk/P1BDh i9U6CAsbxZAyXj34E2HT9jT1ZL0rXhbMTIFyJgXpwDwGyLwgZ87uy/Pb+a2qHqFrAznv LDpQ1gDYNnhYxjhst3zKw3XHTjJ+YXDc7STbnD0NkPqJAv7g3dXbO3uqolAiTurtbtKo pp8WF6zczTz/vh5UCz1TASDct6myWRtOWCJ4Gn9i64kD4/Ym1OKP2+CBgdE5dE+aUVDe ceDw== X-Gm-Message-State: AOAM532WGschQRwcVrL0hTXg+5jL7r/PMjlTRwE8Vhw+mZgb5QMebGmm CF5ob5N0nJI+ohqJV/6n6Yjf7LJ5Acw= X-Google-Smtp-Source: ABdhPJyAxqNMtdBiBsPQOK+qNPhWz5qLzacRvSQsfauMiLcW7szZ4OkJHxMbacLMYF+EszjTfeIXQg== X-Received: by 2002:adf:8481:: with SMTP id 1mr10552305wrg.231.1599774683308; Thu, 10 Sep 2020 14:51:23 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.50.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:51:22 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:48:54 +0200 Message-Id: <20200910214901.25401-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/9] avfilter/lavfutils: Fix memleak when avformat_find_stream_info() fails 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavfilter/lavfutils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index 84dd4c0704..d7de89f4b3 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -46,7 +46,7 @@ int ff_load_image(uint8_t *data[4], int linesize[4], if ((ret = avformat_find_stream_info(format_ctx, NULL)) < 0) { av_log(log_ctx, AV_LOG_ERROR, "Find stream info failed\n"); - return ret; + goto end; } par = format_ctx->streams[0]->codecpar; From patchwork Thu Sep 10 21:48:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22267 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 6F5A044B1C3 for ; Fri, 11 Sep 2020 00:51:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AAB168B9F1; Fri, 11 Sep 2020 00:51:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5BDB968B8FA for ; Fri, 11 Sep 2020 00:51:51 +0300 (EEST) Received: by mail-wm1-f47.google.com with SMTP id w2so2143005wmi.1 for ; Thu, 10 Sep 2020 14:51:51 -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 :mime-version:content-transfer-encoding; bh=SWrESOyNCFu8lchSRfdiKZu6QZuN3fOjU9amBwHPfEw=; b=aKgEKTxaZWYpPavQ3xHtzIXGWJGCgXEdfQA9/aGscHa7oJDwQ0PVHv7Qkjr1Na7jU8 4P4h6mq6KZAC7etvj88VNJoG5Cgx5JkNNEzKyEbNfC3nm4Y90ymGQKNT1RFCgAteVtUq mKGtNsjhWUu5U+zM0iG6tpUYHPQldXy4attaHhxXtXSM4PnfrAx0OZ/hOgrzcf/Ygdhe ZnMD6Wj3224s9rSG16JUCrroXZWF+j/afFAlgpCOSEcZhu7gz6MXSZIWfgDbrcPgRK03 0Q5O2cWMMv+ejmkuQdv/lSChCbZzX/Ni3/NtarCqGerz2qjPmL8bxLoUvVSY51OmRMeW WUlA== 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:mime-version:content-transfer-encoding; bh=SWrESOyNCFu8lchSRfdiKZu6QZuN3fOjU9amBwHPfEw=; b=nSAbwJsolsQ+5RHf8AKPQTl4dLLZYc87fwDgy168DM8wrMO19uRBD5Qg/N1nbyk71G 0fS1aZrHTx1pe4YRtHNt6fo0aBnTOdosfxFK8DrpKGnsXSXHLoFwvgzhUilwUrN3ksA6 s3I5rgFIqWnJeuO5TTMXPV3nA10WnG5h0ivdGNVxEnpEQU/+BuE6o0aeTuFxjiwslgcM TG6Gy8NR0EWTqnwQVO6bRLi+Z3p8+lOHev6erXYqUL5cWindeDmdjVzp5aHKqJvw5pox qBxrJkcNUoyaPpgOVy9uQRygnzGWiH/6+p5UXcrb1q3Cw+qjujdyIroCDR08jeFJPUjg 0d2A== X-Gm-Message-State: AOAM530tBFqo7NzUOr6hO7AC7WfiwM1tVK+WJ+u6w992jjH0dYwgZw41 lvRPFtHn3Qpup4CcMeVyI+Hx4gTnRoM= X-Google-Smtp-Source: ABdhPJw7kPJ1K9/Prk09ZLsVLtLmesiwSt06a5xEuuIapOxx2sXKR30Is7bsYTISgA0YieR0vD7oFw== X-Received: by 2002:a1c:6254:: with SMTP id w81mr2002579wmb.94.1599774710676; Thu, 10 Sep 2020 14:51:50 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.51.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:51:50 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:48:55 +0200 Message-Id: <20200910214901.25401-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/9] avfilter/lavfutils: Avoid initializing packet 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" av_read_frame() can handle uninitialized packets. Signed-off-by: Andreas Rheinhardt --- libavfilter/lavfutils.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index d7de89f4b3..57af5ebfdc 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -35,8 +35,6 @@ int ff_load_image(uint8_t *data[4], int linesize[4], AVPacket pkt; AVDictionary *opt=NULL; - av_init_packet(&pkt); - iformat = av_find_input_format("image2pipe"); if ((ret = avformat_open_input(&format_ctx, filename, iformat, NULL)) < 0) { av_log(log_ctx, AV_LOG_ERROR, @@ -89,6 +87,7 @@ int ff_load_image(uint8_t *data[4], int linesize[4], } ret = avcodec_decode_video2(codec_ctx, frame, &frame_decoded, &pkt); + av_packet_unref(&pkt); if (ret < 0 || !frame_decoded) { av_log(log_ctx, AV_LOG_ERROR, "Failed to decode image from file\n"); if (ret >= 0) @@ -107,7 +106,6 @@ int ff_load_image(uint8_t *data[4], int linesize[4], av_image_copy(data, linesize, (const uint8_t **)frame->data, frame->linesize, *pix_fmt, *w, *h); end: - av_packet_unref(&pkt); avcodec_free_context(&codec_ctx); avformat_close_input(&format_ctx); av_frame_free(&frame); From patchwork Thu Sep 10 21:48:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22268 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 711DA44B1C3 for ; Fri, 11 Sep 2020 00:52:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5773B68B9F5; Fri, 11 Sep 2020 00:52:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C3DF68B8FA for ; Fri, 11 Sep 2020 00:51:53 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id l9so2275321wme.3 for ; Thu, 10 Sep 2020 14:51:53 -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 :mime-version:content-transfer-encoding; bh=SeAm17zV9150N7GEdGKF8p/k3BExr+bshXfdLs5NP5M=; b=Ou+9sltF35n5cDvuE/M+jkfgYNO93fafdB56ilO8bv59v7boN3f9cqjvxsN0P6bBh7 wRcmt91Y2y3vN4PXYuLikpCw16dMfXVL7l9gNVB3PN75edAIAWgDfRGjsz4q8gjJqrNl la3N3xhyfIuxAh+kmrdEIBvXd2Leb56cwRrNbUAlBIEKd7JhK/UYGgaKF5+3GW4wkZAr 7EGv/c0iJ7+zxyWY1gSO3FNtwyyppy5PYk9C0KW1nEI1Ig0WP66DkvrxwiCezOzUq6XD 7XKxCTJ34PRUvvuH/ajloH2QrXZgoiCU6m5XlIbIL7ITxrUTkvgm80U4sSgk0K7/oCLs FruQ== 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:mime-version:content-transfer-encoding; bh=SeAm17zV9150N7GEdGKF8p/k3BExr+bshXfdLs5NP5M=; b=s22WO1AzBHhqPpMMHTvdBL9vNVuq+tZsFkxEdfAmn92lZRC6PoKFhzSSM7CSUD3O/B gJeBYxBp3t/jS4fBpUo6dgC5mam3aEx2WO3R+xHWtAfuowfecMKOadwEeTIXvQeYIHaN F/oSqgVVmnCqoR6FSRgz2j7qZQH8MtH9X923WCFTs+yfiuNM0bfm+y/1J63Vg4OoGjBM yD5UaII6+5dh3ExwKteaM0HNRWfKeWJVPdofQm3NNaBnrxDCCkLzN+7P+G/tgZCCmn6O mz9N9a0wvHR6lvMXN2SUXr3/ccxB55HxV4gI8sNSUgLsjzOZJQ9CpVmD+Yk4g9lu8cI6 KEMA== X-Gm-Message-State: AOAM530UtOH2vmAlOG1EoO633YEJVtw67LP1e1Yim+wUoNUKnMEOXg5+ zoLhjecAZC2TPxmyIsnJaarUDVPMya4= X-Google-Smtp-Source: ABdhPJzk+t59J3hVvQP1zrmcH2EZw1F82jnE9PChOl+YctvMAf3OHDiRBDG9FkFYs61roeF8Gx9IzQ== X-Received: by 2002:a7b:c359:: with SMTP id l25mr1945515wmj.187.1599774712387; Thu, 10 Sep 2020 14:51:52 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.51.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:51:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:48:56 +0200 Message-Id: <20200910214901.25401-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/9] avfilter/vf_uspp: Fix potential leak of dict on error 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_uspp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index f6fb193433..72a0f562af 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -362,9 +362,9 @@ static int config_input(AVFilterLink *inlink) avctx_enc->global_quality = 123; av_dict_set(&opts, "no_bitstream", "1", 0); ret = avcodec_open2(avctx_enc, enc, &opts); + av_dict_free(&opts); if (ret < 0) return ret; - av_dict_free(&opts); av_assert0(avctx_enc->codec); } From patchwork Thu Sep 10 21:48:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22281 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:5387:0:0:0:0:0 with SMTP id h129csp1564584ybb; Thu, 10 Sep 2020 14:52:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyr0KrK+Vk/eRAF922u+JHjSKm+RFLuzGnd3+vESDdtXR1TuRb/+aEhllXIfzIbNFjeN7FO X-Received: by 2002:a7b:c359:: with SMTP id l25mr1946964wmj.187.1599774744945; Thu, 10 Sep 2020 14:52:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599774744; cv=none; d=google.com; s=arc-20160816; b=y8OtlXXiUdlhE2aalN+/np6EBtaoASqTM6pn2k3kzpBL0SeVzJNCsQ0pgjBiWnABqP SBckmeceRhSpD18+hlC4CN4YyYhLOZuJotOY9dnps0yCER40++M/OmFqRK6ki9CELu69 49eatncYAPozGW+OMz+dSfDgRSCTFd33XM3E/bbsYK9kUoGVqKJ2Czozzk6JCJdYpTha 28lfNv6gMbPKJctRngJZKuBFyN9xoReWC6N1QCCP9XK3yFuXc36eDieFPGhY1kANaP8B quiI0cY63BzURFzU2/HDGTH+BaTvWvE2ye2m4b1Gn7i2bCBgY73l+9gQ4J9nPEDl8zq2 91MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=wmMcFbhphDV1ObC0x3St06tKdzACyqNj+ksRILzJKrE=; b=OO3iSsgPdHFuEWB2IVN3Wzu2b/cEgzikJeHiUQN18vCPE+eqk4ss62+a6aAgUwG0KV zf4WzYC5RWL2k0EWK0lQL7NWoPvalbvlVF1HjOKbPeZTT0JQhJNErk24LNAMSDsSQ3n/ sdOwN6Woz1XZklG0QVe34n620nuielub1DXnsq8Q4M24nuFZwYMcG4AbCBv3MkN6NgWo Ig/ruQe2ywshL4AKpEy59cHeChS+B+G7iJYwClv82voDABKwtMUYg9GJuoUx6nYJZJPK c+S7Uc3xryLpMKPYAZz/Z0M92xH/Sit91QHu2KRy7nJjvUMVWoOoQxt+tyKVvu6ezhDY 4TLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=E46dSuUR; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w13si243236wrv.328.2020.09.10.14.52.24; Thu, 10 Sep 2020 14:52:24 -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=@gmail.com header.s=20161025 header.b=E46dSuUR; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DEBDE68BA0A; Fri, 11 Sep 2020 00:52:01 +0300 (EEST) 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 38FDE68B9F7 for ; Fri, 11 Sep 2020 00:51:54 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id e16so8959580wrm.2 for ; Thu, 10 Sep 2020 14:51:54 -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 :mime-version:content-transfer-encoding; bh=/xsKf8dymki0743FgxivGTCkiwHfUkSKJOFMHmNvmXE=; b=E46dSuURDAm/yXfHkNHlpe0SLvwnpcaPWUh/Dt+0Oqn2spLM3TfFEvanSFcPix0Sdz xiClm0GL+kv9kgY8nhR8HhRL1+tAKh6vaAr2KmvirsxG8KQ0cBdP7j4VkwyCotNQbzxa vSOgGI8GJ84SVzMWTi9OkmJ/ysBM1Y/gHzbbMYRq97sYquGTKPwOcEGExz5l4a79nTZT MvaKfcMmR5Lw02JOG2dTjZTh0hi33qAgLhVj6gZxE+d+gvYKDn+ddspTe4GubI2YI+Fg mfbnhmZQObJVeLZPvNDIQiNh818Ac7PLHOhRlSHpCCmeFxstTREk5FO0iqJtuUD4sdpm mESg== 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:mime-version:content-transfer-encoding; bh=/xsKf8dymki0743FgxivGTCkiwHfUkSKJOFMHmNvmXE=; b=tK7UNs9On3Wx2UeiuZJddKZNDK2zeAZyD0G/qPNc5D/KkViRgke5HtK012tViVz7j0 ZXR0qTrZGgpZ2U44XRW4CVnlXRICbrUXUK1DgaJQvgwlumXYs1awT4onX8iAm0YsKRK+ Luis+oWFD2HspychWMj0syVGcwMT8XiCPE3vLEwagSBDA9r1Empdu34ZAs+bHWmYupe2 x/WDZcxU+sSDLHQTAveGOGtL8JCUo/6VdJDiqfherw2em8e69fgf+pftbbXggBXrb8d2 KviJ9redUqgrDfmV5sOs2sALh/ElpbCoq4vkbbXGHlICOPKAljV+Q9qK3f4aet788C8n mrXA== X-Gm-Message-State: AOAM531l6BVMPt8n1WSdEha/fdP4Gu6frGF4ojxgATHQyAFeNjcbZuA4 21PwF6mk/yEz8LvEmkccYdtCKK/t4mw= X-Received: by 2002:a5d:43cb:: with SMTP id v11mr11817478wrr.188.1599774713424; Thu, 10 Sep 2020 14:51:53 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:51:52 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:48:57 +0200 Message-Id: <20200910214901.25401-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/9] avfilter/vf_subtitles: Fix leaks on failure 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IvHhTAVX/EsM Content-Length: 2809 init_subtitles() sometimes returned directly upon error without cleaning up after itself. The easiest way to trigger this is by using picture-based subtitles; it is also possible to run into this in case of missing decoders or allocation failures. Furthermore, return the proper error code in case of missing decoder. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_subtitles.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 1bd42391e0..2d3145bf2d 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -384,13 +384,15 @@ static av_cold int init_subtitles(AVFilterContext *ctx) if (!dec) { av_log(ctx, AV_LOG_ERROR, "Failed to find subtitle codec %s\n", avcodec_get_name(st->codecpar->codec_id)); - return AVERROR(EINVAL); + ret = AVERROR_DECODER_NOT_FOUND; + goto end; } dec_desc = avcodec_descriptor_get(st->codecpar->codec_id); if (dec_desc && !(dec_desc->props & AV_CODEC_PROP_TEXT_SUB)) { av_log(ctx, AV_LOG_ERROR, "Only text based subtitles are currently supported\n"); - return AVERROR_PATCHWELCOME; + ret = AVERROR_PATCHWELCOME; + goto end; } if (ass->charenc) av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0); @@ -398,8 +400,10 @@ static av_cold int init_subtitles(AVFilterContext *ctx) av_dict_set(&codec_opts, "sub_text_format", "ass", 0); dec_ctx = avcodec_alloc_context3(dec); - if (!dec_ctx) - return AVERROR(ENOMEM); + if (!dec_ctx) { + ret = AVERROR(ENOMEM); + goto end; + } ret = avcodec_parameters_to_context(dec_ctx, st->codecpar); if (ret < 0) From patchwork Thu Sep 10 21:48:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22280 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:5387:0:0:0:0:0 with SMTP id h129csp1564663ybb; Thu, 10 Sep 2020 14:52:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4TACuApRV0wQKtxMsIRGhkHXox7gIA4Ck0Hf2NKhW+e6rLTKEDpZqUQxS938DHya652uA X-Received: by 2002:a5d:6343:: with SMTP id b3mr11807424wrw.179.1599774758020; Thu, 10 Sep 2020 14:52:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599774758; cv=none; d=google.com; s=arc-20160816; b=NVG4qtpS6mKlXA/Tl5gKW7qI7sfKZdDzU4R3kljL6A9hpqfOoV9ZNxpRzDibGPewv3 VXseFYr7DDEdExW4W2roR9AOvPq7qGhXF+WhFnpolOMemx5k6IYExENz7BwrvQd0mHAn Ij/FHX4LczyAcxEDFydXAurxbz/URZINPKchScoNYmD7Y8yZ7B0hUmNpHdkD0KYYer59 6BCYBSCDmracLzslFHNfIX4UqCKiHKAGeFwzCH/vtMS7waLclxbb1FEWyPiCXKLvRVX/ ClWtHRrGuG9+yM0W2+SNn/GFHJKKl3qEb0KfrubBDE/R+u+6+AZg4I+vOEm+mtbk7BOq zQEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=0zPUIn0cZuyVe3Zw2mBs6B0uMGd3tu2y252V48zfN34=; b=in4oKwffwkvn3wFjpZaBalqMmJWEkhyKAKWi57dD5JqCGwhVXz8oDJRj2NMDGsJ05R vROTGaKDWQ12XeZ48F0Q7k+JOnWDiTOZ53P6eaHSMPq6sWcfmRED14qahB5NWIee6880 udQn2w09+z6ku8VFpzxNVo5KSWHVNibSxnN9iApDb4IS5d4C9R9rLp4FLpp0ia0kqy6X IUSO5t1jDO2eQahTvQLPpxsxX+kpvYbXPjWFHNFeouFU7Nqa5wwAR3dh8LsgtIoYUeH1 peVdaeqZT6HeZb4xUyU737exr/oF+QmdnM6NWjq7iydLUENOWEzIbA6bFNBx4yXzCRDj IVSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BNTjW31N; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i11si257675wrm.145.2020.09.10.14.52.37; Thu, 10 Sep 2020 14:52:38 -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=@gmail.com header.s=20161025 header.b=BNTjW31N; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5148868B9E5; Fri, 11 Sep 2020 00:52:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B87968BA0E for ; Fri, 11 Sep 2020 00:51:57 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id x14so8897494wrl.12 for ; Thu, 10 Sep 2020 14:51:57 -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 :mime-version:content-transfer-encoding; bh=JpjP1VVAD8grKjqLU4GVnVW7kk+gLgIMk0qQzqPP5+M=; b=BNTjW31NVf0rvF4NP5EQf5kZxn9cx115H+aQt07ZczdUItCYmyciyCpjQxM3pgCL6W LQ4iID9VBCExxEM0RzG96D8o/2uZFmuE7gdhB+dNcCxDY7vzioSTqrVBl7x/ZwIlKqwX Tid67bbLWM1J4jpONqIG0/ovZjC3QBWNzd8Z1OMBlcy3XVlza21ndcp4JX4m+gPDx7zI ac2O+nFYndueHbCsjPODxGLkUoNlL9qzHXPaSOHMXukq4WrcM5KyD7ujfJaTDPjcgIqc N0ec07QA3XuD8p4xKw+eiMzlftqRlbJGvXutltxkSlKXc2G3lz3JSAane2BvMvLd7IVt YGtA== 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:mime-version:content-transfer-encoding; bh=JpjP1VVAD8grKjqLU4GVnVW7kk+gLgIMk0qQzqPP5+M=; b=JxIG4WhFexUpnKlOg7Ov71ktwnz1H3WTj+zhm6yCe536LaZhAMgCmznTwtTBZyuijW Wf1N2r1lG6uYaT8SLr8f1wCXAJXexJSw0AQwOn0d9gVDt+3WP86Qt1+UMyFQ1tqC33IA MwO+FA1EFZ6422RbP86aLUfnzdBof5h59dhhhpY/19nbZikLu5iHtUYmyjRUPiJqKStb XsUSVwe4lhKGyog3C/gIRpFZPy5Ym8nM5A60+7prNLWDzBV7OUz28ogtzpVPj+tanqh7 kv4olZllJBzqA5Szb+07pk/HYLDTzrjVc4cD8dT8GX6VihlsVv0lOwW0meUKjNCRfCet lRyQ== X-Gm-Message-State: AOAM5307LPo8l30oj32e2VoGTvKxJc7yxOgn5XPPrexl+BonWRYkqmHE 57cn28ZnoMHlnyhihNK5mlxnWDPFQgs= X-Received: by 2002:a5d:67cd:: with SMTP id n13mr10781118wrw.51.1599774716679; Thu, 10 Sep 2020 14:51:56 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.51.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:51:56 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:48:58 +0200 Message-Id: <20200910214901.25401-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/9] avfilter/vf_subtitles: Remove unnecessary initialization of AVPacket 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: e8rNd+2Vin1N Content-Length: 1415 av_read_frame() can handle uninitialized packets. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_subtitles.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 2d3145bf2d..a045375b2d 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -449,9 +449,6 @@ static av_cold int init_subtitles(AVFilterContext *ctx) ass_process_codec_private(ass->track, dec_ctx->subtitle_header, dec_ctx->subtitle_header_size); - av_init_packet(&pkt); - pkt.data = NULL; - pkt.size = 0; while (av_read_frame(fmt, &pkt) >= 0) { int i, got_subtitle; AVSubtitle sub = {0}; From patchwork Thu Sep 10 21:48:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22269 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 220BE44B1C3 for ; Fri, 11 Sep 2020 00:52:01 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12F5B68BA04; Fri, 11 Sep 2020 00:52:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8864268B9F3 for ; Fri, 11 Sep 2020 00:51:58 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id o5so8876044wrn.13 for ; Thu, 10 Sep 2020 14:51:58 -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 :mime-version:content-transfer-encoding; bh=7xtSx6YDHBbC6JiyqqWI22xbD9c/AUnu8JniQLhTYVg=; b=i/eCf2LuOw2RTDLFz2WQn5m6WuEPlCwJgPP0/5VDCx18QZasuqCt/j7ChxvN4Sw2RO hau/OkCRMcH7S2FIC4AzyJlv/1ysaIHWuoAZcZRe77y+fDwa7UHtVbD7mkWMURc+y/Vs xWp3XXzlr+vAHKtLNpBjweciLHY4PjRFoNlUMIvuWnfOnAoVnAFQ/srXyzOrj9bk5Kdh f0NZLzPZWX74lA91gjmlw5vlwKIZOZTQw4LxQj+R9fu1FznzNmb531Txz999y1sDMT4/ x1AiE7W+GY+TuEMfNUnJYsZgZH1P43I94wSEULw7lVuuCoFp2XVH/9Tm/rxAi1Ow8XlE IeQA== 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:mime-version:content-transfer-encoding; bh=7xtSx6YDHBbC6JiyqqWI22xbD9c/AUnu8JniQLhTYVg=; b=O1SwqaBEQ5FN/3NS7R3g4WinaP6kY6JpSZyw+EhpENukDOUkMYO9vQghIDb9pkhOxe JAHzXxRXZBr2J5HwzQ+pwHJGcXC+JngRLBzrwwwt6McIuFEGNhGrxVtU3+5LFF6TObRu dYgXolrY/wSJnU/eCsfy7/XkX195IXWn7+tAU3GL6+hyFuP1bqjgc0ITrdjtc7c5cv+M kl4P3G7Q6+0RjjhIfNwMdYa5nWwI+zk7Dmej6xv0cEGvptZvoA2RARVjkKSQScqZDNDE POw5bowCA3+NqpfUQk+4Nky1QaNCu07s5VPNMelnoKMAYpxLk5ZWG/bFK92ZMMimpvgo R9Jw== X-Gm-Message-State: AOAM5303ajZRcf/F6nxoT+6qgtZhiSwCzL+437oLkLMCHzx7o1HeUzhG CCUQ5ey7ccBQsjLBoQ5KMr7yqX92wqc= X-Google-Smtp-Source: ABdhPJwUQ3Gms/GTJzoI0ZFNHYI91YiitX56WtW9H/m0QKIiKNkkXhnVhnr9GEqupb4T6V+2QTl9oA== X-Received: by 2002:a5d:4645:: with SMTP id j5mr10003610wrs.388.1599774717809; Thu, 10 Sep 2020 14:51:57 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.51.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:51:57 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:48:59 +0200 Message-Id: <20200910214901.25401-7-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/9] avfilter/vf_subtitles: Remove obsolete LIBAVCODEC_VERSION_INT checks 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" libavcodec major version is already 58. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_subtitles.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index a045375b2d..08b4d4efca 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -396,8 +396,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx) } if (ass->charenc) av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0); - if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57,26,100)) - av_dict_set(&codec_opts, "sub_text_format", "ass", 0); + av_dict_set(&codec_opts, "sub_text_format", "ass", 0); dec_ctx = avcodec_alloc_context3(dec); if (!dec_ctx) { @@ -465,11 +464,8 @@ static av_cold int init_subtitles(AVFilterContext *ctx) char *ass_line = sub.rects[i]->ass; if (!ass_line) break; - if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,25,100)) - ass_process_data(ass->track, ass_line, strlen(ass_line)); - else - ass_process_chunk(ass->track, ass_line, strlen(ass_line), - start_time, duration); + ass_process_chunk(ass->track, ass_line, strlen(ass_line), + start_time, duration); } } } From patchwork Thu Sep 10 21:49:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22275 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:5387:0:0:0:0:0 with SMTP id h129csp1564733ybb; Thu, 10 Sep 2020 14:52:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAHzB4Jz++QItY2eAG21GUUOaIohXSklC1YtN12E/VPvPol6BXWr/iNuXSA3BnwPVUraaA X-Received: by 2002:a05:600c:2207:: with SMTP id z7mr2116624wml.42.1599774764545; Thu, 10 Sep 2020 14:52:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599774764; cv=none; d=google.com; s=arc-20160816; b=hLoHTuSPz7ZurwhbwsJ8gRp/zns+mbE3iuXiIVvM1GQVPEcFZbBfU5ECiPrt1z+JZm KpjIQdmyfpGORIadqgPvNYxhshP8vis/V9Zx9UylZbGOb1U2mjyO/nFM4edoY9btaQ+J BP7pelXPhuPPogPKrtP6kW6/e7mCk4Z1VkBPyOGMNay7SQOK5JuGXLtqcCO3f/XSmdlG Xly9vGJGdGpUXJPYkftYBB1I+DkbOEqmK0+y4ovreftuc3b4SpbBq0iPnUZ4ZlPHugU/ evURC8ck55w3YkJ5zvw0yaFVCRfM7quvtBRPl0fKeZFck8NeADjY2GuLvaWEPZpnSpeY b8bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=y8eqDDfd7gqesv1jqaaUuIhGF3iQaFfjc5mqCoBsPHc=; b=HUGkMd324ocFH7ywcYD1CVxaHhQNKTgteX0OCFYUkVa8gu5PDTWu7m45IWlMHtTSYW DGEiEXi9eerMT82qisRV6lfZRZn8LVsR7DNwjRGAi5fVk3Gi/+HFCvB5MAbomcVnY4bO 26RLdiSOGN/kcFauKksmW237AtXK40ADlrmybb9UpQ0kmoBL/0J/zyY7axLsNg8emKyf +oGGLxBLMnGCUrNunC+msMACwfqQ3CO3SVCCYNuQORlM69mJp5g802nCt/nT2qwF1EfF dPy4+vRZlyQ6+PYYDFzHI3Sfwm1RO8OzsRVqukZasQrL8NzBymXQbdgHPX5e20kPbOrs Ja0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=cVs+Qhs7; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f17si316348wru.4.2020.09.10.14.52.44; Thu, 10 Sep 2020 14:52:44 -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=@gmail.com header.s=20161025 header.b=cVs+Qhs7; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D161168BA15; Fri, 11 Sep 2020 00:52:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9F6168BA08 for ; Fri, 11 Sep 2020 00:52:05 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id e16so8960490wrm.2 for ; Thu, 10 Sep 2020 14:52:05 -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 :mime-version:content-transfer-encoding; bh=W/GjL3A75FJfl9xA/coayJg4S1N6ffj/GOTUB8NdiX8=; b=cVs+Qhs7EJJHYWFCJGXydqLr0dT0VVOsgQ+bAn4tkhAAGCgrCnh1NF2n1CovyfNcB4 duqUR7OfBQgh02PwJDG5nr1ECdaA4jagVfA9MDYY1YMavAhuxt59y6mozXVc3TG14S92 3JydcgKF/c9PQk/UhV5i5j5zeZCtTDW1Wqm+57ZVjDB1q58XXBgF5T2lCW25ZdUUNio8 PtvGg3u8Cs9MFrDOFn6Frw8Y1JIBc1We1VyV8AaBFDN5l+bnNtW+k6gDBnx0TMJfA4LB 97hED9WG1hJ5Wb3muyKfimwpDUG7Q8v0z5DMN8/UhtF7DE0xBaiq2LWzdv/aO1liocQl 1gbw== 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:mime-version:content-transfer-encoding; bh=W/GjL3A75FJfl9xA/coayJg4S1N6ffj/GOTUB8NdiX8=; b=LRFrVXm788cUqlbf/V/5NW4RG9Tny2YrG1UuwMN/jAnUxnIEhTtOCv4h6eQOeryI/W G+aLzmuahPKcaGVcGxCjdEv+ay8rv5I1O0qun3DhCpWAI5odRZnt23iBrm7TNWrJYZ4c b8mrcSQ1YcQu+gvYl3qx4E6C7WQMtjFYfqlhejJx2SBrUFyEKoybGg60rAK8NsXqsdCU 5c56TSoJ9PaEhtgPqPx6lW1Z7WgkChlRp3E4Qjj/Wse23ij+Vozf1+1lxIiHVEUOUo78 ADPFpejAcSGNTucHdX4kql547m4cI4gwz5BBIBSv1Yct12D1TGm67btuLAzRapBKAFfS 8ZKQ== X-Gm-Message-State: AOAM5328fv5ft78KqhBaDwwIROldT/SrCgJAFvvTLpa0KLq+32OrspiS e17XT1kji3yvNe7LCpLmsjT39tPhjXw= X-Received: by 2002:adf:f492:: with SMTP id l18mr11796591wro.280.1599774724817; Thu, 10 Sep 2020 14:52:04 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:52:04 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:49:00 +0200 Message-Id: <20200910214901.25401-8-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 8/9] avfilter/vf_subtitles: Return early upon avformat_open_input() failure 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: J24O/FRmj12O Content-Length: 1318 There is nothing to free at this point. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_subtitles.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index 08b4d4efca..f9733c3935 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -322,7 +322,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx) ret = avformat_open_input(&fmt, ass->filename, NULL, NULL); if (ret < 0) { av_log(ctx, AV_LOG_ERROR, "Unable to open %s\n", ass->filename); - goto end; + return ret; } ret = avformat_find_stream_info(fmt, NULL); if (ret < 0) From patchwork Thu Sep 10 21:49:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22270 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 AC3F544B5C8 for ; Fri, 11 Sep 2020 00:52:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E43668BA23; Fri, 11 Sep 2020 00:52:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDF2868BA20 for ; Fri, 11 Sep 2020 00:52:33 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id a9so2290044wmm.2 for ; Thu, 10 Sep 2020 14:52:33 -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 :mime-version:content-transfer-encoding; bh=Ys/zMeaNfK/0bW5/yFvVqlXEpByrqYfK/TZQ5QaaWC0=; b=GNGybjQ4G49vFgRDh1wQsSkxeFzmFj7ikZJ9C/cmtO4wkxuBbHobRm6cXmrkelItDj Sbab6HNPYDTlIzjV2jTqr0/HBF5SFCrkT+7VfG/h/8AszicUj3hYF0k1KNDuSqUSqYyX LiOEGwl3Uyh/OwGrz6Z1DPVrvZe5F+XC7GGUdocImk4EoLj+CD/7mr5Zyj0vOlRxHyvz ozP60Xax+AfPEhlRp2oDG94RuNnWyAeTMLvh8VnbtdfT/PM/Hy11iW+wGNZB6bFacSVA n/hzaIxpCvwvF9CVAaBVYXv1yjFeg2TzhIFqxU01DJ4pGKBFC63/vVjrs35UXbUVnJwV GA6g== 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:mime-version:content-transfer-encoding; bh=Ys/zMeaNfK/0bW5/yFvVqlXEpByrqYfK/TZQ5QaaWC0=; b=ctKLtogpQ8ni7W2UCu9UPp7LsfNqFtUSJT/0DIGxBeYCVmhlAOyff0XCFzgjeBK2uP EHYrwjEVsucUtGQzFzE3TYEENynXQKjP4U9cbrckbhHH/mCFhEkaaZL4zsU4PWEECUoc 975eunjXt9Tc+HyZT0M+K3IgheUx7BcLJN7XbuuY3M3aSg24ipKcZhVFX6HUJ+TBLW5x sTnUacqQqJ7Uko0b0/DRS+UItx4DDKtmBk+rsSPifBzSeV3AFQEYV4Aqaz9aVOqalevi 2PuBMpKlxD8Q6i0uj75S/RJT4glaylwjDK2rji4M/eWuEqS5FFwIDRFJTI8Tw0X/esTm +1Lg== X-Gm-Message-State: AOAM532U58+z1skylV+FmcKzhAI2WiPpk3JUgStN4EOZ0M2O8lEELXSd fSXFDNMVRAL10wPJtO8/5Cr4vVetssY= X-Google-Smtp-Source: ABdhPJw0M0e2/cd5qwPH8JUKmXz+Gv/cYIjs+QQVtLzEyaNOvju7tfYGgZAXcjasL+ZuoLTQV6X5Nw== X-Received: by 2002:a05:600c:2183:: with SMTP id e3mr2153938wme.49.1599774752452; Thu, 10 Sep 2020 14:52:32 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z203sm59232wmc.31.2020.09.10.14.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 14:52:31 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 10 Sep 2020 23:49:01 +0200 Message-Id: <20200910214901.25401-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> References: <20200910214901.25401-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 9/9] fftools, libavcodec, libavfilter: Add const to some AVCodec * 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The user has no business modifying the underlying AVCodec. Signed-off-by: Andreas Rheinhardt --- fftools/ffmpeg.h | 5 +++-- fftools/ffmpeg_filter.c | 5 +++-- libavcodec/avrndec.c | 2 +- libavcodec/utils.c | 4 ++-- libavfilter/lavfutils.c | 2 +- libavfilter/src_movie.c | 2 +- libavfilter/vf_mcdeint.c | 2 +- libavfilter/vf_subtitles.c | 2 +- libavfilter/vf_uspp.c | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 908bc73fca..8665218dcf 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -638,8 +638,9 @@ void assert_avoptions(AVDictionary *m); int guess_input_channel_layout(InputStream *ist); -enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *avctx, AVCodec *codec, enum AVPixelFormat target); -void choose_sample_fmt(AVStream *st, AVCodec *codec); +enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *avctx, + const AVCodec *codec, enum AVPixelFormat target); +void choose_sample_fmt(AVStream *st, const AVCodec *codec); int configure_filtergraph(FilterGraph *fg); int configure_output_filter(FilterGraph *fg, OutputFilter *ofilter, AVFilterInOut *out); diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 3c507f8c1d..e9e31e043e 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -60,7 +60,8 @@ static const enum AVPixelFormat *get_compliance_unofficial_pix_fmts(enum AVCodec } } -enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, AVCodec *codec, enum AVPixelFormat target) +enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, + const AVCodec *codec, enum AVPixelFormat target) { if (codec && codec->pix_fmts) { const enum AVPixelFormat *p = codec->pix_fmts; @@ -90,7 +91,7 @@ enum AVPixelFormat choose_pixel_fmt(AVStream *st, AVCodecContext *enc_ctx, AVCod return target; } -void choose_sample_fmt(AVStream *st, AVCodec *codec) +void choose_sample_fmt(AVStream *st, const AVCodec *codec) { if (codec && codec->sample_fmts) { const enum AVSampleFormat *p = codec->sample_fmts; diff --git a/libavcodec/avrndec.c b/libavcodec/avrndec.c index a7bdab280d..f4ec490de5 100644 --- a/libavcodec/avrndec.c +++ b/libavcodec/avrndec.c @@ -46,7 +46,7 @@ static av_cold int init(AVCodecContext *avctx) } if(a->is_mjpeg) { - AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG); + const AVCodec *codec = avcodec_find_decoder(AV_CODEC_ID_MJPEG); AVDictionary *thread_opt = NULL; if (!codec) { av_log(avctx, AV_LOG_ERROR, "MJPEG codec not found\n"); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 2e5185f364..d93a0953fa 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -695,7 +695,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code if ((avctx->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) && avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { const char *codec_string = av_codec_is_encoder(codec) ? "encoder" : "decoder"; - AVCodec *codec2; + const AVCodec *codec2; av_log(avctx, AV_LOG_ERROR, "The %s '%s' is experimental but experimental codecs are not enabled, " "add '-strict %d' if you want to use it.\n", @@ -1193,7 +1193,7 @@ FF_ENABLE_DEPRECATION_WARNINGS const char *avcodec_get_name(enum AVCodecID id) { const AVCodecDescriptor *cd; - AVCodec *codec; + const AVCodec *codec; if (id == AV_CODEC_ID_NONE) return "none"; diff --git a/libavfilter/lavfutils.c b/libavfilter/lavfutils.c index 57af5ebfdc..a2085ed5ef 100644 --- a/libavfilter/lavfutils.c +++ b/libavfilter/lavfutils.c @@ -27,7 +27,7 @@ int ff_load_image(uint8_t *data[4], int linesize[4], { AVInputFormat *iformat = NULL; AVFormatContext *format_ctx = NULL; - AVCodec *codec; + const AVCodec *codec; AVCodecContext *codec_ctx = NULL; AVCodecParameters *par; AVFrame *frame = NULL; diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index d83cb6d1e4..ab12c34f4a 100644 --- a/libavfilter/src_movie.c +++ b/libavfilter/src_movie.c @@ -155,7 +155,7 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) static int open_stream(AVFilterContext *ctx, MovieStream *st) { - AVCodec *codec; + const AVCodec *codec; int ret; codec = avcodec_find_decoder(st->st->codecpar->codec_id); diff --git a/libavfilter/vf_mcdeint.c b/libavfilter/vf_mcdeint.c index 9cdec6308d..bc7b3230d3 100644 --- a/libavfilter/vf_mcdeint.c +++ b/libavfilter/vf_mcdeint.c @@ -102,7 +102,7 @@ static int config_props(AVFilterLink *inlink) { AVFilterContext *ctx = inlink->dst; MCDeintContext *mcdeint = ctx->priv; - AVCodec *enc; + const AVCodec *enc; AVCodecContext *enc_ctx; AVDictionary *opts = NULL; int ret; diff --git a/libavfilter/vf_subtitles.c b/libavfilter/vf_subtitles.c index f9733c3935..f53aa063d2 100644 --- a/libavfilter/vf_subtitles.c +++ b/libavfilter/vf_subtitles.c @@ -302,7 +302,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx) AVDictionary *codec_opts = NULL; AVFormatContext *fmt = NULL; AVCodecContext *dec_ctx = NULL; - AVCodec *dec = NULL; + const AVCodec *dec; const AVCodecDescriptor *dec_desc; AVStream *st; AVPacket pkt; diff --git a/libavfilter/vf_uspp.c b/libavfilter/vf_uspp.c index 72a0f562af..6a814350e8 100644 --- a/libavfilter/vf_uspp.c +++ b/libavfilter/vf_uspp.c @@ -316,7 +316,7 @@ static int config_input(AVFilterLink *inlink) const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); int i; - AVCodec *enc = avcodec_find_encoder(AV_CODEC_ID_SNOW); + const AVCodec *enc = avcodec_find_encoder(AV_CODEC_ID_SNOW); if (!enc) { av_log(ctx, AV_LOG_ERROR, "SNOW encoder not found.\n"); return AVERROR(EINVAL);