summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-17 21:11:29 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-17 21:11:29 +0100
commitf3bb5f28d35ee6ba266f72e8d61ffd069c390559 (patch)
treee447347d8778a20ef95a2781e70040eb44235a6f /libavcodec
parent27f55beba2bf9c94996660556543dce1b3ed04b1 (diff)
parent4d7ab5cfebef91820af2933ef2f622ea598e6b53 (diff)
Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'
* commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53': doxygen: Add a number of missing function parameter descriptions Conflicts: libavformat/avformat.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/avcodec.h2
-rw-r--r--libavcodec/avfft.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 655c280287..f9b2e5cf27 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4746,7 +4746,9 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height);
/**
* Put a string representing the codec tag codec_tag in buf.
*
+ * @param buf buffer to place codec tag in
* @param buf_size size in bytes of buf
+ * @param codec_tag codec tag to assign
* @return the length of the string that would have been generated if
* enough space had been available, excluding the trailing null
*/
diff --git a/libavcodec/avfft.h b/libavcodec/avfft.h
index 2d20a45f87..0c0f9b8d8d 100644
--- a/libavcodec/avfft.h
+++ b/libavcodec/avfft.h
@@ -99,9 +99,11 @@ enum DCTTransformType {
/**
* Set up DCT.
+ *
* @param nbits size of the input array:
* (1 << nbits) for DCT-II, DCT-III and DST-I
* (1 << nbits) + 1 for DCT-I
+ * @param type the type of transform
*
* @note the first element of the input of DST-I is ignored
*/