From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C18B540AA5 for ; Thu, 3 Feb 2022 20:10:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABF9568B1B0; Thu, 3 Feb 2022 22:10:46 +0200 (EET) Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E31568AF5A for ; Thu, 3 Feb 2022 22:10:38 +0200 (EET) Received: by mail-qv1-f44.google.com with SMTP id k4so3568684qvt.6 for ; Thu, 03 Feb 2022 12:10:38 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=VHf/zsPBhIwtalbx9QeR1vPOt4seY3grtOPlWQOWnk0=; b=IvXSJWiqfymUjrkJ0Ujgaew0sWgYcfQggQedrTe/azXlPUNN/yumDzFVFAZXH7sgLj TYIIW1a7Jq+kxHGaq2nLwiCcD8+cZkDyvi6WXRwRqmt+qsVUOBaYK1kpFRK5Y/avvwQT wEqHv+zjBI3lAaok8jMWxONyasDwu0GcSncGVyrNa3EQOP4XFQ6iezjwJU7tzFYPd3Sp koedLxS/oBj1ShE6zQNS8WRO2bD6jYNvbQBn1x6bfpanXLcxqV2pNZLGebDAJOiahD4V /OUgtUf7+sbLDNiJdEOlwaiFYCstzoOzklcUKxt0xSa0fIGTDjXj+4lJPcgBYt5mGUl+ UfcA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=VHf/zsPBhIwtalbx9QeR1vPOt4seY3grtOPlWQOWnk0=; b=hW5AQ5dnHElUZgJIpEvlsnGPUpLOAH//ldLrh5X6dSIbn5TMqm7PTj3AkO7CVExDhw ZCFp99BaMBbWYNkk2+D37M/92qbcZoI8Ks8ZWeW1ZqHpJpVNXCr+1SsfhCtgvDpdlyiO H2uaZtrtcucX+oYiRDY9KcqU9wD29OUK1dyr05QX0llKEJkNpj5SdOEuaoVgGQ3GWR7A Nuaa9Lgv5ZXXEzIjozykT5x40y5nF7o4Hidd6wAPC/NUuD0kO2h+XkR0F7Ht/IRK/lTW m/fOQQIVHXc1ZPAvU1WqZb2HWjmskOISSL4gAHQsUOQwn9ZKoXcWPrh19/Ja+UHMdMBA EeQw== X-Gm-Message-State: AOAM533SUl093xDDP9QZrw1w2old0VTGejF6uNmLC9G+PgSwrqzOdWPs cI3Gs0hBXmJvQCoD3XFzipXAbpVebe6iag== X-Google-Smtp-Source: ABdhPJw4nyfkvtyxSFGakD0TR3DLjQqs5G5ByH1gISAsPqxLY5UsR6esynCefUbOVaaYAFdXBDBu6Q== X-Received: by 2002:a05:6214:d4c:: with SMTP id 12mr32526409qvr.101.1643919036940; Thu, 03 Feb 2022 12:10:36 -0800 (PST) Received: from localhost.localdomain ([151.200.235.219]) by smtp.gmail.com with ESMTPSA id bp37sm14731321qkb.135.2022.02.03.12.10.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Feb 2022 12:10:36 -0800 (PST) From: Scott Theisen To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Feb 2022 15:09:29 -0500 Message-Id: <20220203200930.30744-2-scott.the.elm@gmail.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220203200930.30744-1-scott.the.elm@gmail.com> References: <20220201223058.31090-1-scott.the.elm@gmail.com> <20220203200930.30744-1-scott.the.elm@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] libavutil: create av_media_type_get_string() 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This deprecates av_get_media_type_string() which does return NULL. printf %s with a null pointer is undefined behavior This also matches behavior with avcodec_get_name() which never returns NULL, instead it returns "unknown_codec". --- doc/APIchanges | 3 +++ libavutil/avutil.h | 7 +++++++ libavutil/utils.c | 13 +++++++++++++ 3 files changed, 23 insertions(+) diff --git a/doc/APIchanges b/doc/APIchanges index 315a04c952..5b2ef724be 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-02-03 - xxxxxxxxxxx - lavu 57.19.100 - avutil.h + Add av_media_type_get_string() which deprecates av_get_media_type_string(). + 2022-01-26 - af94ab7c7c0 - lavu 57.19.100 - tx.h Add AV_TX_FLOAT_RDFT, AV_TX_DOUBLE_RDFT and AV_TX_INT32_RDFT. diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 4d633156d1..6cabeb405a 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -209,9 +209,16 @@ enum AVMediaType { /** * Return a string describing the media_type enum, NULL if media_type * is unknown. + * + * @deprecated Use av_media_type_get_string() instead. */ const char *av_get_media_type_string(enum AVMediaType media_type); +/** + * Return a string describing the media_type enum, never NULL. + */ +const char *av_media_type_get_string(enum AVMediaType media_type); + /** * @defgroup lavu_const Constants * @{ diff --git a/libavutil/utils.c b/libavutil/utils.c index ea9b5097b8..92d242f678 100644 --- a/libavutil/utils.c +++ b/libavutil/utils.c @@ -80,6 +80,19 @@ const char *av_get_media_type_string(enum AVMediaType media_type) } } +const char *av_media_type_get_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 "invalid_media_type"; + } +} + char av_get_picture_type_char(enum AVPictureType pict_type) { switch (pict_type) { -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".