diff options
| -rw-r--r-- | ffmpeg.c | 2 | ||||
| -rw-r--r-- | ffplay.c | 2 | ||||
| -rw-r--r-- | libavfilter/avcodec.c | 2 | ||||
| -rw-r--r-- | libavfilter/avcodec.h | 8 | ||||
| -rw-r--r-- | libavfilter/version.h | 3 |
5 files changed, 15 insertions, 2 deletions
@@ -1964,7 +1964,7 @@ static int poll_filters(void) switch (ost->filter->filter->inputs[0]->type) { case AVMEDIA_TYPE_VIDEO: - avfilter_fill_frame_from_video_buffer_ref(filtered_frame, picref); + avfilter_copy_buf_props(filtered_frame, picref); filtered_frame->pts = frame_pts; if (!ost->frame_aspect_ratio) ost->st->codec->sample_aspect_ratio = picref->video->sample_aspect_ratio; @@ -1732,7 +1732,7 @@ static int video_thread(void *arg) if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0) is->frame_last_filter_delay = 0; - avfilter_fill_frame_from_video_buffer_ref(frame, picref); + avfilter_copy_buf_props(frame, picref); pts_int = picref->pts; tb = filt_out->inputs[0]->time_base; diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c index ce53ed9118..c50cd18f0b 100644 --- a/libavfilter/avcodec.c +++ b/libavfilter/avcodec.c @@ -131,6 +131,7 @@ int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src) return 0; } +#ifdef FF_API_FILL_FRAME int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame, const AVFilterBufferRef *samplesref) { @@ -148,3 +149,4 @@ int avfilter_fill_frame_from_buffer_ref(AVFrame *frame, { return avfilter_copy_buf_props(frame, ref); } +#endif diff --git a/libavfilter/avcodec.h b/libavfilter/avcodec.h index 9636cfd1bc..b7965da102 100644 --- a/libavfilter/avcodec.h +++ b/libavfilter/avcodec.h @@ -66,6 +66,7 @@ AVFilterBufferRef *avfilter_get_video_buffer_ref_from_frame(const AVFrame *frame AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame, int perms); +#ifdef FF_API_FILL_FRAME /** * Fill an AVFrame with the information stored in samplesref. * @@ -73,7 +74,9 @@ AVFilterBufferRef *avfilter_get_audio_buffer_ref_from_frame(const AVFrame *frame * @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); @@ -84,7 +87,9 @@ int avfilter_fill_frame_from_audio_buffer_ref(AVFrame *frame, * @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); @@ -95,9 +100,12 @@ int avfilter_fill_frame_from_video_buffer_ref(AVFrame *frame, * @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 /** * Add frame data to buffer_src. diff --git a/libavfilter/version.h b/libavfilter/version.h index a5aa29ce07..a3f6816ec2 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -74,5 +74,8 @@ #ifndef FF_API_FOO_COUNT #define FF_API_FOO_COUNT (LIBAVFILTER_VERSION_MAJOR < 4) #endif +#ifndef FF_API_FILL_FRAME +#define FF_API_FILL_FRAME (LIBAVFILTER_VERSION_MAJOR < 4) +#endif #endif // AVFILTER_VERSION_H |