[FFmpeg-devel] [PATCH 3/3] avcodec.h: move avcodec_get_{type, name} to codec_id.h

[James Almer]

On 5/25/2020 10:12 AM, Anton Khirnov wrote:
> ---
>  libavcodec/avcodec.h  | 11 -----------
>  libavcodec/codec_id.h | 12 ++++++++++++
>  2 files changed, 12 insertions(+), 11 deletions(-)
> 
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 4f46a1fb2e..01099bc8cd 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -4115,17 +4115,6 @@ attribute_deprecated
>  int av_lockmgr_register(int (*cb)(void **mutex, enum AVLockOp op));
>  #endif
>  
> -/**
> - * Get the type of the given codec.
> - */
> -enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
> -
> -/**
> - * Get the name of a codec.
> - * @return  a static string identifying the codec; never NULL
> - */
> -const char *avcodec_get_name(enum AVCodecID id);
> -
>  /**
>   * @return a positive value if s is open (i.e. avcodec_open2() was called on it
>   * with no corresponding avcodec_close()), 0 otherwise.
> diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h
> index e95737c0a2..f7cb0a6056 100644
> --- a/libavcodec/codec_id.h
> +++ b/libavcodec/codec_id.h
> @@ -21,6 +21,8 @@
>  #ifndef AVCODEC_CODEC_ID_H
>  #define AVCODEC_CODEC_ID_H
>  
> +#include "libavutil/avutil.h"
> +
>  /**
>   * @addtogroup lavc_core
>   * @{
> @@ -556,6 +558,16 @@ enum AVCodecID {
>      AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, AVFrames wrapped in AVPacket
>  };
>  
> +/**
> + * Get the type of the given codec.
> + */
> +enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
> +
> +/**
> + * Get the name of a codec.
> + * @return  a static string identifying the codec; never NULL
> + */
> +const char *avcodec_get_name(enum AVCodecID id);
>  
>  /**
>   * @}

LGTM.