diff mbox

[FFmpeg-devel,11/11] avcodec/avcodec: Nits

Message ID 20191210215955.11178-11-andreas.rheinhardt@gmail.com
State Accepted
Headers show

Commit Message

Andreas Rheinhardt Dec. 10, 2019, 9:59 p.m. UTC
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavcodec/avcodec.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Andreas Rheinhardt Feb. 12, 2020, 4 p.m. UTC | #1
On Tue, Dec 10, 2019 at 11:00 PM Andreas Rheinhardt <
andreas.rheinhardt@gmail.com> wrote:

> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavcodec/avcodec.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 735a3c2d76..ab61f76337 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -4848,7 +4848,7 @@ int avcodec_decode_video2(AVCodecContext *avctx,
> AVFrame *picture,
>   * If no subtitle could be decompressed, got_sub_ptr is zero.
>   * Otherwise, the subtitle is stored in *sub.
>   * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This
> is for
> - * simplicity, because the performance difference is expect to be
> negligible
> + * simplicity, because the performance difference is expected to be
> negligible
>   * and reusing a get_buffer written for video codecs would probably
> perform badly
>   * due to a potentially very different allocation pattern.
>   *
> @@ -4864,7 +4864,7 @@ int avcodec_decode_video2(AVCodecContext *avctx,
> AVFrame *picture,
>   * before packets may be fed to the decoder.
>   *
>   * @param avctx the codec context
> - * @param[out] sub The Preallocated AVSubtitle in which the decoded
> subtitle will be stored,
> + * @param[out] sub The preallocated AVSubtitle in which the decoded
> subtitle will be stored,
>   *                 must be freed with avsubtitle_free if *got_sub_ptr is
> set.
>   * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed,
> otherwise, it is nonzero.
>   * @param[in] avpkt The input AVPacket containing the input buffer.
> @@ -4991,7 +4991,7 @@ int avcodec_send_frame(AVCodecContext *avctx, const
> AVFrame *frame);
>   * @param avctx codec context
>   * @param avpkt This will be set to a reference-counted packet allocated
> by the
>   *              encoder. Note that the function will always call
> - *              av_frame_unref(frame) before doing anything else.
> + *              av_packet_unref(avpkt) before doing anything else.
>   * @return 0 on success, otherwise negative error code:
>   *      AVERROR(EAGAIN):   output is not available in the current state -
> user
>   *                         must try to send input
> --
> 2.20.1
>

Ping.

- Andreas
Michael Niedermayer Feb. 13, 2020, 12:18 a.m. UTC | #2
On Tue, Dec 10, 2019 at 10:59:55PM +0100, Andreas Rheinhardt wrote:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavcodec/avcodec.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

will apply

thx

[...]
diff mbox

Patch

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 735a3c2d76..ab61f76337 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -4848,7 +4848,7 @@  int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
  * If no subtitle could be decompressed, got_sub_ptr is zero.
  * Otherwise, the subtitle is stored in *sub.
  * Note that AV_CODEC_CAP_DR1 is not available for subtitle codecs. This is for
- * simplicity, because the performance difference is expect to be negligible
+ * simplicity, because the performance difference is expected to be negligible
  * and reusing a get_buffer written for video codecs would probably perform badly
  * due to a potentially very different allocation pattern.
  *
@@ -4864,7 +4864,7 @@  int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
  * before packets may be fed to the decoder.
  *
  * @param avctx the codec context
- * @param[out] sub The Preallocated AVSubtitle in which the decoded subtitle will be stored,
+ * @param[out] sub The preallocated AVSubtitle in which the decoded subtitle will be stored,
  *                 must be freed with avsubtitle_free if *got_sub_ptr is set.
  * @param[in,out] got_sub_ptr Zero if no subtitle could be decompressed, otherwise, it is nonzero.
  * @param[in] avpkt The input AVPacket containing the input buffer.
@@ -4991,7 +4991,7 @@  int avcodec_send_frame(AVCodecContext *avctx, const AVFrame *frame);
  * @param avctx codec context
  * @param avpkt This will be set to a reference-counted packet allocated by the
  *              encoder. Note that the function will always call
- *              av_frame_unref(frame) before doing anything else.
+ *              av_packet_unref(avpkt) before doing anything else.
  * @return 0 on success, otherwise negative error code:
  *      AVERROR(EAGAIN):   output is not available in the current state - user
  *                         must try to send input