[FFmpeg-cvslog] avcodec.h: move avcodec_get_{type,name} to codec_id.h

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Mon May 25 15:06:14 2020 +0200| [b5aee6086b717b83bce8f6be4324fabaddec6209] | committer: Anton Khirnov

avcodec.h: move avcodec_get_{type,name} to codec_id.h

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b5aee6086b717b83bce8f6be4324fabaddec6209
---

 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);
 
 /**
  * @}