aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2021-05-31 12:13:51 +0200
committerAnton Khirnov <anton@khirnov.net>2021-06-10 16:51:44 +0200
commit881db34f6a02be3a3a5aa56d8712cb1ecc9a7d13 (patch)
treed15477563b9825c5e7da3f471f9862331addc2d0 /libavcodec
parent2628dff366b8a63303a34a4e6990a7d845f421bc (diff)
downloadffmpeg-881db34f6a02be3a3a5aa56d8712cb1ecc9a7d13.tar.gz
lavc: move av_get_pcm_codec() from avcodec.h to codec_id.h
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h8
-rw-r--r--libavcodec/codec_id.h9
2 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 3787504ec3..c30c035532 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3112,14 +3112,6 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
void avcodec_flush_buffers(AVCodecContext *avctx);
/**
- * Return the PCM codec associated with a sample format.
- * @param be endianness, 0 for little, 1 for big,
- * -1 (or anything else) for native
- * @return AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE
- */
-enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
-
-/**
* Return audio frame duration.
*
* @param avctx codec context
diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h
index 3b1a71f8ea..d49f9af36c 100644
--- a/libavcodec/codec_id.h
+++ b/libavcodec/codec_id.h
@@ -22,6 +22,7 @@
#define AVCODEC_CODEC_ID_H
#include "libavutil/avutil.h"
+#include "libavutil/samplefmt.h"
/**
* @addtogroup lavc_core
@@ -612,6 +613,14 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
const char *avcodec_profile_name(enum AVCodecID codec_id, int profile);
/**
+ * Return the PCM codec associated with a sample format.
+ * @param be endianness, 0 for little, 1 for big,
+ * -1 (or anything else) for native
+ * @return AV_CODEC_ID_PCM_* or AV_CODEC_ID_NONE
+ */
+enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
+
+/**
* @}
*/