MMX, MMX2, SSE2 and SSSE3 optimizations for pred16x16/8x8_plane H264 intra

[ffmpeg] / libavcodec / audioconvert.h

diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h
index 46ba3d39296c1c609ef259d0cebfa8fbb4c75ea9..349065edc2629bfef92b21cb2bba19ac0020441a 100644 (file)
--- a/libavcodec/audioconvert.h
+++ b/libavcodec/audioconvert.h
@@ -24,11 +24,12 @@
 #define AVCODEC_AUDIOCONVERT_H
 
 /**
- * @file libavcodec/audioconvert.h
+ * @file
  * Audio format conversion routines
  */
 
 
+#include "libavutil/cpu.h"
 #include "avcodec.h"
 
 
@@ -59,6 +60,11 @@ enum SampleFormat avcodec_get_sample_fmt(const char* name);
  */
 const char *avcodec_get_channel_name(int channel_id);
 
+/**
+ * @return channel layout that matches name, 0 if no match
+ */
+int64_t avcodec_get_channel_layout(const char *name);
+
 /**
  * Return description of channel layout
  */
@@ -88,7 +94,7 @@ typedef struct AVAudioConvert AVAudioConvert;
  * @param in_fmt Input sample format
  * @param in_channels Number of input channels
  * @param[in] matrix Channel mixing matrix (of dimension in_channel*out_channels). Set to NULL to ignore.
- * @param flags See FF_MM_xx
+ * @param flags See AV_CPU_FLAG_xx
  * @return NULL on error
  */
 AVAudioConvert *av_audio_convert_alloc(enum SampleFormat out_fmt, int out_channels,
@@ -103,9 +109,9 @@ void av_audio_convert_free(AVAudioConvert *ctx);
 /**
  * Convert between audio sample formats
  * @param[in] out array of output buffers for each channel. set to NULL to ignore processing of the given channel.
- * @param[in] out_stride distance between consecutive input samples (measured in bytes)
+ * @param[in] out_stride distance between consecutive output samples (measured in bytes)
  * @param[in] in array of input buffers for each channel
- * @param[in] in_stride distance between consecutive output samples (measured in bytes)
+ * @param[in] in_stride distance between consecutive input samples (measured in bytes)
  * @param len length of audio frame size (measured in samples)
  */
 int av_audio_convert(AVAudioConvert *ctx,