summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2021-05-21 18:32:50 +0200
committerAnton Khirnov <anton@khirnov.net>2021-06-10 16:51:44 +0200
commit000f35125f26d92a80b02d945ef2b3a3e2a11c20 (patch)
tree28f0d85fc2a99394c2a06bf0eb29187fd64d23d9 /libavcodec
parentff0a96046d8d2758139872fd94f95da9d5b83caa (diff)
lavc: move av_get_[exact_]bits_per_sample() to codec_id.h
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h18
-rw-r--r--libavcodec/codec_id.h18
2 files changed, 18 insertions, 18 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1838b9dcdb..cec4a0cb24 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3125,14 +3125,6 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
void avcodec_flush_buffers(AVCodecContext *avctx);
/**
- * Return codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum AVCodecID codec_id);
-
-/**
* Return the PCM codec associated with a sample format.
* @param be endianness, 0 for little, 1 for big,
* -1 (or anything else) for native
@@ -3141,16 +3133,6 @@ int av_get_bits_per_sample(enum AVCodecID codec_id);
enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
/**
- * Return codec bits per sample.
- * Only return non-zero if the bits per sample is exactly correct, not an
- * approximation.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
-
-/**
* Return audio frame duration.
*
* @param avctx codec context
diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h
index 83e1dbb4b3..6141268096 100644
--- a/libavcodec/codec_id.h
+++ b/libavcodec/codec_id.h
@@ -581,6 +581,24 @@ enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
const char *avcodec_get_name(enum AVCodecID id);
/**
+ * Return codec bits per sample.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return codec bits per sample.
+ * Only return non-zero if the bits per sample is exactly correct, not an
+ * approximation.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
+
+/**
* @}
*/