[FFmpeg-cvslog] Merge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Apr  3 20:41:16 2017 +0200| [47d8410daca4aaf08bc886eb6d08e6fafe4fb6f1] | committer: Clément Bœsch

Merge commit 'a1d9de304fe63614e3aa8117fef17491fa80093d'

* commit 'a1d9de304fe63614e3aa8117fef17491fa80093d':
  Fix some mismatches between function parameter and doxygen parameter names.

Merged-by: Clément Bœsch <u at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=47d8410daca4aaf08bc886eb6d08e6fafe4fb6f1
---

 libavcodec/avcodec.h       | 2 +-
 libavresample/avresample.h | 4 ++--
 libavutil/hwcontext.h      | 2 +-
 libavutil/imgutils.h       | 4 ++--
 libavutil/stereo3d.h       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 6f38b3f..377aa53 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4458,7 +4458,7 @@ AVPacket *av_packet_clone(const AVPacket *src);
  * Free the packet, if the packet is reference counted, it will be
  * unreferenced first.
  *
- * @param packet packet to be freed. The pointer will be set to NULL.
+ * @param pkt packet to be freed. The pointer will be set to NULL.
  * @note passing NULL is a no-op.
  */
 void av_packet_free(AVPacket **pkt);
diff --git a/libavresample/avresample.h b/libavresample/avresample.h
index 4cfbdfc..193443e 100644
--- a/libavresample/avresample.h
+++ b/libavresample/avresample.h
@@ -490,8 +490,8 @@ int avresample_convert_frame(AVAudioResampleContext *avr,
  * @see avresample_close();
  *
  * @param avr             audio resample context
- * @param output          output AVFrame
- * @param input           input AVFrame
+ * @param out             output AVFrame
+ * @param in              input AVFrame
  * @return                0 on success, AVERROR on failure.
  */
 int avresample_config(AVAudioResampleContext *avr, AVFrame *out, AVFrame *in);
diff --git a/libavutil/hwcontext.h b/libavutil/hwcontext.h
index e35fb25..284b091 100644
--- a/libavutil/hwcontext.h
+++ b/libavutil/hwcontext.h
@@ -417,7 +417,7 @@ void *av_hwdevice_hwconfig_alloc(AVBufferRef *device_ctx);
  * configuration is provided, returns the maximum possible capabilities
  * of the device.
  *
- * @param device_ctx a reference to the associated AVHWDeviceContext.
+ * @param ref a reference to the associated AVHWDeviceContext.
  * @param hwconfig a filled HW-specific configuration structure, or NULL
  *        to return the maximum possible capabilities of the device.
  * @return AVHWFramesConstraints structure describing the constraints
diff --git a/libavutil/imgutils.h b/libavutil/imgutils.h
index a4a5efc..ea083b1 100644
--- a/libavutil/imgutils.h
+++ b/libavutil/imgutils.h
@@ -155,7 +155,7 @@ void av_image_copy_uc_from(uint8_t *dst_data[4],       const ptrdiff_t dst_lines
  * one call, use av_image_alloc().
  *
  * @param dst_data      data pointers to be filled in
- * @param dst_linesizes linesizes for the image in dst_data to be filled in
+ * @param dst_linesize  linesizes for the image in dst_data to be filled in
  * @param src           buffer which will contain or contains the actual image data, can be NULL
  * @param pix_fmt       the pixel format of the image
  * @param width         the width of the image in pixels
@@ -185,7 +185,7 @@ int av_image_get_buffer_size(enum AVPixelFormat pix_fmt, int width, int height,
  * @param dst           a buffer into which picture data will be copied
  * @param dst_size      the size in bytes of dst
  * @param src_data      pointers containing the source image data
- * @param src_linesizes linesizes for the image in src_data
+ * @param src_linesize  linesizes for the image in src_data
  * @param pix_fmt       the pixel format of the source image
  * @param width         the width of the source image in pixels
  * @param height        the height of the source image in pixels
diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h
index 19c5416..2cfe470 100644
--- a/libavutil/stereo3d.h
+++ b/libavutil/stereo3d.h
@@ -161,7 +161,7 @@ const char *av_stereo3d_type_name(unsigned int type);
 /**
  * Get the AVStereo3DType form a human-readable name.
  *
- * @param type The input string.
+ * @param name The input string.
  *
  * @return The AVStereo3DType value, or -1 if not found.
  */


======================================================================