[FFmpeg-devel] [PATCH 2/3] avcodec/codec: use the correct name for all AVCodec.decode() parameters

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Sun Mar 7 15:43:40 EET 2021


James Almer:
> This field hasn't been used to return the output frame size since
> avcodec_decode_audio3() was removed.

If I read 0eea212943544d40f99b05571aa7159d78667154 correctly, then the
semantics changed with the addition of avcodec_decode_audio4() and not
the removal of avcodec_decode_audio3(); (but there seemed to be some
leftovers after that commit).

> 
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  libavcodec/codec.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/libavcodec/codec.h b/libavcodec/codec.h
> index 3d7a1f4c26..bcda061da1 100644
> --- a/libavcodec/codec.h
> +++ b/libavcodec/codec.h
> @@ -281,7 +281,8 @@ typedef struct AVCodec {
>       */
>      int (*encode2)(struct AVCodecContext *avctx, struct AVPacket *avpkt,
>                     const struct AVFrame *frame, int *got_packet_ptr);
> -    int (*decode)(struct AVCodecContext *, void *outdata, int *outdata_size, struct AVPacket *avpkt);
> +    int (*decode)(struct AVCodecContext *, void *outdata, int *got_frame_ptr,
> +                  struct AVPacket *avpkt);

I initially wanted to ask you to split the line after outdata to make
this more balanced, but given that you need to add avctx anyway you have
to do it anyway.

>      int (*close)(struct AVCodecContext *);
>      /**
>       * Encode API with decoupled frame/packet dataflow. This function is called
> 



More information about the ffmpeg-devel mailing list