From patchwork Tue Feb 1 22:30:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Theisen X-Patchwork-Id: 34055 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1028540iov; Tue, 1 Feb 2022 14:31:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJzujGWPofgk6Jh8ezPc+bo5UYBnKBE9SLh6QDrZhZfzFYBCHYqr/lWeJ/XDfrWoSvzy1nQg X-Received: by 2002:a17:907:6e05:: with SMTP id sd5mr22434112ejc.170.1643754699525; Tue, 01 Feb 2022 14:31:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643754699; cv=none; d=google.com; s=arc-20160816; b=aoi9sPz26jkX931Hyz7ma147PaHhRhdMhRbblJF3etdg3S3o5R32Dp8kxe75oS4WIE Ci54+SiqVijh1+PBQtNJu6n+ji8G4DnF22wXc+zK3UFulwYFEKde5V49HcZfOulvvO7W p0apbiwmBmpRowGtWjark53OstwjeSjzaXr08HcwHYUfyq5FxKNGpd8hE0LZzGKwcfDv OfwrDxX0B9ziW7rG/eEIRnpMneiwU5kyXBHw8zMPMX8iNty31deBrnsooMzbUXqE5SEe Jy9PldYek3dMRnFS8FcDZcdAkML17JM3Px6/0+E0u3IHTGitYvGi7UwwF9j4K5z/51bx H48A== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=SGSAqPCMDFLsEmrzBBxulfBAJ3nTPSbqE5VL6fHyLWI=; b=p7aLAGm9ularL5WtroqFNzVD/QsyyhBnrKkbqzpcqeOAZN6LCISwzyKSACitu5iMMs 4A9UXiFd/4X7fmwbyLFtq4zIGi5j0Cgnpfy7h69JwlKb+JitO7mrERH9rfHggvt94vzb zWpGLKR+2HysKiss/Mx6sb7dS4cv1PBC4gypvy3RnIZifF9fLCAsyulnI0XHzqCyiOnL jheuofui0hYvvQyoEMl3T+Eg3NYs+ZbkZXHqbrBPXrf0FD5HVbw5SDVwFBjMYXFnNMy9 8pl+4g//YMZOIK8cJ0UOjot3YYvKTcCe/kBOtejj9CjlOr6A6W6KZ6DEFLRK6gLO5Pe0 ZlWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HHxVz8rm; 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 p14si10031494edx.33.2022.02.01.14.31.38; Tue, 01 Feb 2022 14:31:39 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HHxVz8rm; 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 C56AE68B118; Wed, 2 Feb 2022 00:31:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA92D68AF00 for ; Wed, 2 Feb 2022 00:31:27 +0200 (EET) Received: by mail-qk1-f176.google.com with SMTP id bs32so5151101qkb.1 for ; Tue, 01 Feb 2022 14:31:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NFwTo+6wikQljLRp10LZYerzN71erBVQxcNqX8ItyT4=; b=HHxVz8rmPTLdwAZzlxozODwDyzmdJg4H+gBlcOrJV7Hgrch1xn3pceeLVqZGKu55t0 o9eQj6/E3BdJbU3HvZ5Unm12Up8CLKn4yiz8ZuARbNQLKLx3q4Pg7pvaSLLKX4C1xEJE LAhSjiydzzxMBezBJBmysP7F+ZQPvQqeItIQSyLtCDEYoF4/2iDuPCURZP17Iknv5nk/ Xiw8XFFTb1I1S2+ZEF4ao0KbvrCYHuREQqW4VRfvr+vSrR4UUJDAjdPLASEHV71qLtMe ongq06k7hzg+hzq0Rde1HedHoxPYJ6oWOR1JWXf54qDy8GTOqwOgQitcTWrcW7F9zojR iEKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=NFwTo+6wikQljLRp10LZYerzN71erBVQxcNqX8ItyT4=; b=U5E2gOEfT4Z45SFE+jVs/AYDFe4bjGj23ZwvU0FuZ9nTf2QjLda192BRl4NBegP2tv 2oujgdo5eiMmIoLSpGJyym5lQV46XN6835h4tuD9rPj0hkXcjvjzt4aRp6jgELkwfNLS 7m8Thz3RV90Y/3CMeQ2q/NwWGNTqz4/OiSSmfdgRmJQcPWAXfom8YsB+O06GHLf4Q4At Q+it0Rrq0hWmLLMe2K9ZJc/7WSWAaFtgM0BHwQ8uKdpME1N115D5IvBl3K6tAhwQfPf5 d76AaP4/Evm7rePr2djT6DAF/LbozKI3Rb2DBfIpq62qCwljbdi8qKoqXMGQ2Hh977xe h27Q== X-Gm-Message-State: AOAM533XgcJM7qQKr8mSueNk88FoPOTlT7u3+4GvN2Lz3inIF8A3dgN7 pFdfaUzAuaPD/IRsEewa7nUBasFslsrWlA== X-Received: by 2002:a37:62c4:: with SMTP id w187mr18922969qkb.652.1643754686077; Tue, 01 Feb 2022 14:31:26 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id j196sm10635587qke.134.2022.02.01.14.31.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 14:31:25 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 17:30:58 -0500 Message-Id: <20220201223058.31090-1-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavu: make av_get_media_type_string() never return NULL X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Scott Theisen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WjdSDZUedWjc printf %s with a null pointer is undefined behavior --- libavutil/avutil.h | 3 +-- libavutil/utils.c | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 4d633156d1..4bd468d72f 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -207,8 +207,7 @@ enum AVMediaType { }; /** - * Return a string describing the media_type enum, NULL if media_type - * is unknown. + * Return a string describing the media_type enum, never NULL. */ const char *av_get_media_type_string(enum AVMediaType media_type); diff --git a/libavutil/utils.c b/libavutil/utils.c index ea9b5097b8..c85d7abace 100644 --- a/libavutil/utils.c +++ b/libavutil/utils.c @@ -71,12 +71,13 @@ const char *avutil_license(void) const char *av_get_media_type_string(enum AVMediaType media_type) { switch (media_type) { + case AVMEDIA_TYPE_UNKNOWN: return "unknown"; case AVMEDIA_TYPE_VIDEO: return "video"; case AVMEDIA_TYPE_AUDIO: return "audio"; case AVMEDIA_TYPE_DATA: return "data"; case AVMEDIA_TYPE_SUBTITLE: return "subtitle"; case AVMEDIA_TYPE_ATTACHMENT: return "attachment"; - default: return NULL; + default: return "invalid"; } }