On Mon, Mar 7, 2016 at 3:12 PM, wm4 <nfx...@googlemail.com> wrote:
> And replace some doxygen references to them.
> ---
> libavcodec/avcodec.h | 12 +++++++++---
> libavformat/avformat.h | 4 ++--
> 2 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> index 3517584..0d15d13 100644
> --- a/libavcodec/avcodec.h
> +++ b/libavcodec/avcodec.h
> @@ -1501,7 +1501,7 @@ typedef struct AVCodecContext {
> * the decoded frame is cropped before being output.
> *
> * @note Those field may not match the value of the last
> - * AVFrame outputted by avcodec_decode_video2 due frame
> + * AVFrame outputted by avcodec_receive_frame() due frame
> * reordering.
> *
> * - encoding: unused
> @@ -1528,7 +1528,7 @@ typedef struct AVCodecContext {
> * May be overriden by the decoder if it knows better.
> *
> * @note This field may not match the value of the last
> - * AVFrame outputted by avcodec_decode_video2 due frame
> + * AVFrame outputted by avcodec_receive_frame() due frame
> * reordering.
> *
> * - encoding: Set by user.
> @@ -3655,7 +3655,7 @@ int avcodec_parameters_to_context(AVCodecContext *codec,
> * @warning This function is not thread safe!
> *
> * @note Always call this function before using decoding routines (such as
> - * @ref avcodec_decode_video2()).
> + * @ref avcodec_receive_frame()).
> *
> * @code
> * avcodec_register_all();
> @@ -4053,7 +4053,10 @@ void avcodec_align_dimensions2(AVCodecContext *s, int
> *width, int *height,
> * @return A negative error code is returned if an error occurred during
> * decoding, otherwise the number of bytes consumed from the input
> * AVPacket is returned.
> + *
> +* @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
> */
> +attribute_deprecated
> int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame,
> int *got_frame_ptr, AVPacket *avpkt);
>
> @@ -4099,7 +4102,10 @@ int avcodec_decode_audio4(AVCodecContext *avctx,
> AVFrame *frame,
> * @param[in,out] got_picture_ptr Zero if no frame could be decompressed,
> otherwise, it is nonzero.
> * @return On error a negative value is returned, otherwise the number of
> bytes
> * used or zero if no frame could be decompressed.
> + *
> + * @deprecated Use avcodec_send_packet() and avcodec_receive_frame().
> */
> +attribute_deprecated
> int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture,
> int *got_picture_ptr,
> AVPacket *avpkt);
> diff --git a/libavformat/avformat.h b/libavformat/avformat.h
> index 6db17f7..1a99948 100644
> --- a/libavformat/avformat.h
> +++ b/libavformat/avformat.h
> @@ -149,8 +149,8 @@
> * av_read_frame() on it. Each call, if successful, will return an AVPacket
> * containing encoded data for one AVStream, identified by
> * AVPacket.stream_index. This packet may be passed straight into the
> libavcodec
> - * decoding functions avcodec_decode_video2(), avcodec_decode_audio4() or
> - * avcodec_decode_subtitle2() if the caller wishes to decode the data.
> + * decoding functions avcodec_send_packet() or avcodec_decode_subtitle2() if
> the
> + * caller wishes to decode the data.
> *
> * AVPacket.pts, AVPacket.dts and AVPacket.duration timing information will
> be
> * set if known. They may also be unset (i.e. AV_NOPTS_VALUE for
> --
> 2.7.0
I would add more info in doc/APIchanges too.
--
Vittorio
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
