Commit 47d8410d authored by Clément Bœsch's avatar Clément Bœsch

Merge commit 'a1d9de30'

* commit 'a1d9de30':
  Fix some mismatches between function parameter and doxygen parameter names.
Merged-by: 's avatarClément Bœsch <u@pkh.me>
parents ab827a83 a1d9de30
...@@ -4458,7 +4458,7 @@ AVPacket *av_packet_clone(const AVPacket *src); ...@@ -4458,7 +4458,7 @@ AVPacket *av_packet_clone(const AVPacket *src);
* Free the packet, if the packet is reference counted, it will be * Free the packet, if the packet is reference counted, it will be
* unreferenced first. * 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. * @note passing NULL is a no-op.
*/ */
void av_packet_free(AVPacket **pkt); void av_packet_free(AVPacket **pkt);
......
...@@ -490,8 +490,8 @@ int avresample_convert_frame(AVAudioResampleContext *avr, ...@@ -490,8 +490,8 @@ int avresample_convert_frame(AVAudioResampleContext *avr,
* @see avresample_close(); * @see avresample_close();
* *
* @param avr audio resample context * @param avr audio resample context
* @param output output AVFrame * @param out output AVFrame
* @param input input AVFrame * @param in input AVFrame
* @return 0 on success, AVERROR on failure. * @return 0 on success, AVERROR on failure.
*/ */
int avresample_config(AVAudioResampleContext *avr, AVFrame *out, AVFrame *in); int avresample_config(AVAudioResampleContext *avr, AVFrame *out, AVFrame *in);
......
...@@ -417,7 +417,7 @@ void *av_hwdevice_hwconfig_alloc(AVBufferRef *device_ctx); ...@@ -417,7 +417,7 @@ void *av_hwdevice_hwconfig_alloc(AVBufferRef *device_ctx);
* configuration is provided, returns the maximum possible capabilities * configuration is provided, returns the maximum possible capabilities
* of the device. * 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 * @param hwconfig a filled HW-specific configuration structure, or NULL
* to return the maximum possible capabilities of the device. * to return the maximum possible capabilities of the device.
* @return AVHWFramesConstraints structure describing the constraints * @return AVHWFramesConstraints structure describing the constraints
......
...@@ -155,7 +155,7 @@ void av_image_copy_uc_from(uint8_t *dst_data[4], const ptrdiff_t dst_lines ...@@ -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(). * one call, use av_image_alloc().
* *
* @param dst_data data pointers to be filled in * @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 src buffer which will contain or contains the actual image data, can be NULL
* @param pix_fmt the pixel format of the image * @param pix_fmt the pixel format of the image
* @param width the width of the image in pixels * @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, ...@@ -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 a buffer into which picture data will be copied
* @param dst_size the size in bytes of dst * @param dst_size the size in bytes of dst
* @param src_data pointers containing the source image data * @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 pix_fmt the pixel format of the source image
* @param width the width of the source image in pixels * @param width the width of the source image in pixels
* @param height the height of the source image in pixels * @param height the height of the source image in pixels
......
...@@ -161,7 +161,7 @@ const char *av_stereo3d_type_name(unsigned int type); ...@@ -161,7 +161,7 @@ const char *av_stereo3d_type_name(unsigned int type);
/** /**
* Get the AVStereo3DType form a human-readable name. * 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. * @return The AVStereo3DType value, or -1 if not found.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment