[FFmpeg-devel] [PATCH 14/18] avfilter: remove obsolete FF_API_FILL_FRAME cruft

[Paul B Mahol]

On 9/15/14, James Almer <jamrial at gmail.com> wrote:
> Signed-off-by: James Almer <jamrial at gmail.com>
> ---
>  libavfilter/avcodec.c | 20 --------------------
>  libavfilter/avcodec.h | 41 -----------------------------------------
>  libavfilter/version.h |  3 ---
>  3 files changed, 64 deletions(-)
>
> diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c
> index ba11a25..e0d9015 100644
> --- a/libavfilter/avcodec.c
> +++ b/libavfilter/avcodec.c
> @@ -135,23 +135,3 @@ int avfilter_copy_buf_props(AVFrame *dst, const
> AVFilterBufferRef *src)
>      return 0;
>  }
>  #endif
> -
> -#if FF_API_FILL_FRAME
> -int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
> -                                              const AVFilterBufferRef
> *samplesref)
> -{
> -    return avfilter_copy_buf_props(frame, samplesref);
> -}
> -
> -int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
> -                                              const AVFilterBufferRef
> *picref)
> -{
> -    return avfilter_copy_buf_props(frame, picref);
> -}
> -
> -int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
> -                                        const AVFilterBufferRef *ref)
> -{
> -    return avfilter_copy_buf_props(frame, ref);
> -}
> -#endif
> diff --git a/libavfilter/avcodec.h b/libavfilter/avcodec.h
> index 8bbdad2..d3d0e20 100644
> --- a/libavfilter/avcodec.h
> +++ b/libavfilter/avcodec.h
> @@ -66,45 +66,4 @@ AVFilterBufferRef
> *avfilter_get_buffer_ref_from_frame(enum AVMediaType type,
>                                                        int perms);
>  #endif
>
> -#if FF_API_FILL_FRAME
> -/**
> - * Fill an AVFrame with the information stored in samplesref.
> - *
> - * @param frame an already allocated AVFrame
> - * @param samplesref an audio buffer reference
> - * @return >= 0 in case of success, a negative AVERROR code in case of
> - * failure
> - * @deprecated Use avfilter_copy_buf_props() instead.
> - */
> -attribute_deprecated
> -int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame,
> -                                              const AVFilterBufferRef
> *samplesref);
> -
> -/**
> - * Fill an AVFrame with the information stored in picref.
> - *
> - * @param frame an already allocated AVFrame
> - * @param picref a video buffer reference
> - * @return >= 0 in case of success, a negative AVERROR code in case of
> - * failure
> - * @deprecated Use avfilter_copy_buf_props() instead.
> - */
> -attribute_deprecated
> -int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame,
> -                                              const AVFilterBufferRef
> *picref);
> -
> -/**
> - * Fill an AVFrame with information stored in ref.
> - *
> - * @param frame an already allocated AVFrame
> - * @param ref a video or audio buffer reference
> - * @return >= 0 in case of success, a negative AVERROR code in case of
> - * failure
> - * @deprecated Use avfilter_copy_buf_props() instead.
> - */
> -attribute_deprecated
> -int avfilter_fill_frame_from_buffer_ref(AVFrame *frame,
> -                                        const AVFilterBufferRef *ref);
> -#endif
> -
>  #endif /* AVFILTER_AVCODEC_H */
> diff --git a/libavfilter/version.h b/libavfilter/version.h
> index 6ebb1ce..4b1a359 100644
> --- a/libavfilter/version.h
> +++ b/libavfilter/version.h
> @@ -55,9 +55,6 @@
>  #ifndef FF_API_FOO_COUNT
>  #define FF_API_FOO_COUNT                    (LIBAVFILTER_VERSION_MAJOR <
> 6)
>  #endif
> -#ifndef FF_API_FILL_FRAME
> -#define FF_API_FILL_FRAME                   (LIBAVFILTER_VERSION_MAJOR <
> 5)
> -#endif
>  #ifndef FF_API_BUFFERSRC_BUFFER
>  #define FF_API_BUFFERSRC_BUFFER             (LIBAVFILTER_VERSION_MAJOR <
> 5)
>  #endif
> --
> 1.8.5.5
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

lgtm