Cosmetics: Pretty print the AAC encoder.

[ffmpeg] / libavcodec / audioconvert.h

diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index e10849bd3a16782e9cd4431034264ee88553744f..46ba3d39296c1c609ef259d0cebfa8fbb4c75ea9 100644 (file)
--- a/libavcodec/audioconvert.h
+++ b/libavcodec/audioconvert.h
@@ -20,11 +20,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef FFMPEG_AUDIOCONVERT_H
-#define FFMPEG_AUDIOCONVERT_H
+#ifndef AVCODEC_AUDIOCONVERT_H
+#define AVCODEC_AUDIOCONVERT_H
 
 /**
- * @file audioconvert.h
+ * @file libavcodec/audioconvert.h
  * Audio format conversion routines
  */
 
@@ -54,6 +54,30 @@ const char *avcodec_get_sample_fmt_name(int sample_fmt);
  */
 enum SampleFormat avcodec_get_sample_fmt(const char* name);
 
+/**
+ * @return NULL on error
+ */
+const char *avcodec_get_channel_name(int channel_id);
+
+/**
+ * Return description of channel layout
+ */
+void avcodec_get_channel_layout_string(char *buf, int buf_size, int nb_channels, int64_t channel_layout);
+
+/**
+ * Guess the channel layout
+ * @param nb_channels
+ * @param codec_id Codec identifier, or CODEC_ID_NONE if unknown
+ * @param fmt_name Format name, or NULL if unknown
+ * @return Channel layout mask
+ */
+int64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name);
+
+/**
+ * @return the number of channels in the channel layout.
+ */
+int avcodec_channel_layout_num_channels(int64_t channel_layout);
+
 struct AVAudioConvert;
 typedef struct AVAudioConvert AVAudioConvert;
 
@@ -88,4 +112,4 @@ int av_audio_convert(AVAudioConvert *ctx,
                            void * const out[6], const int out_stride[6],
                      const void * const  in[6], const int  in_stride[6], int len);
 
-#endif /* FFMPEG_AUDIOCONVERT_H */
+#endif /* AVCODEC_AUDIOCONVERT_H */