This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 9034587d10594211e4379f63f94df04201a1f9b3 Author: Niklas Haas <[email protected]> AuthorDate: Sun Mar 29 16:32:55 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Fri Apr 10 15:12:18 2026 +0200 avfilter/framepool: make ff_sws_frame_pool_{audio,video}_init static Not used outside of the (strictly more flexible) _reinit() anymore. Signed-off-by: Niklas Haas <[email protected]> --- libavfilter/framepool.c | 16 ++++++++-------- libavfilter/framepool.h | 44 ++++++++------------------------------------ 2 files changed, 16 insertions(+), 44 deletions(-) diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c index 049388d1fe..c61e9eefb5 100644 --- a/libavfilter/framepool.c +++ b/libavfilter/framepool.c @@ -49,9 +49,9 @@ struct FFFramePool { }; -av_cold FFFramePool *ff_frame_pool_video_init(int width, int height, - enum AVPixelFormat format, - int align) +static av_cold FFFramePool *frame_pool_video_init(int width, int height, + enum AVPixelFormat format, + int align) { int i, ret; FFFramePool *pool; @@ -111,9 +111,9 @@ fail: return NULL; } -av_cold FFFramePool *ff_frame_pool_audio_init(int channels, int nb_samples, - enum AVSampleFormat format, - int align) +static av_cold FFFramePool *frame_pool_audio_init(int channels, int nb_samples, + enum AVSampleFormat format, + int align) { int ret, planar; FFFramePool *pool; @@ -272,7 +272,7 @@ int ff_frame_pool_video_reinit(FFFramePool **pool, return 0; } - FFFramePool *new = ff_frame_pool_video_init(width, height, format, align); + FFFramePool *new = frame_pool_video_init(width, height, format, align); if (!new) return AVERROR(ENOMEM); @@ -297,7 +297,7 @@ int ff_frame_pool_audio_reinit(FFFramePool **pool, return 0; } - FFFramePool *new = ff_frame_pool_audio_init(channels, nb_samples, format, align); + FFFramePool *new = frame_pool_audio_init(channels, nb_samples, format, align); if (!new) return AVERROR(ENOMEM); diff --git a/libavfilter/framepool.h b/libavfilter/framepool.h index f16c9b9d4f..63e8df2730 100644 --- a/libavfilter/framepool.h +++ b/libavfilter/framepool.h @@ -32,42 +32,6 @@ */ typedef struct FFFramePool FFFramePool; -/** - * Allocate and initialize a video frame pool. - * - * @param width width of each frame in this pool - * @param height height of each frame in this pool - * @param format format of each frame in this pool - * @param align buffers alignment of each frame in this pool - * @return newly created video frame pool on success, NULL on error. - */ -FFFramePool *ff_frame_pool_video_init(int width, - int height, - enum AVPixelFormat format, - int align); - -/** - * Allocate and initialize an audio frame pool. - * - * @param channels channels of each frame in this pool - * @param nb_samples number of samples of each frame in this pool - * @param format format of each frame in this pool - * @param align buffers alignment of each frame in this pool - * @return newly created audio frame pool on success, NULL on error. - */ -FFFramePool *ff_frame_pool_audio_init(int channels, - int samples, - enum AVSampleFormat format, - int align); - -/** - * Deallocate the frame pool. It is safe to call this function while - * some of the allocated frame are still in use. - * - * @param pool pointer to the frame pool to be freed. It will be set to NULL. - */ -void ff_frame_pool_uninit(FFFramePool **pool); - /** * Recreate the video frame pool if its current configuration differs from the * provided configuration. If initialization fails, the old pool is kept @@ -106,6 +70,14 @@ int ff_frame_pool_audio_reinit(FFFramePool **pool, enum AVSampleFormat format, int align); +/** + * Deallocate the frame pool. It is safe to call this function while + * some of the allocated frame are still in use. + * + * @param pool pointer to the frame pool to be freed. It will be set to NULL. + */ +void ff_frame_pool_uninit(FFFramePool **pool); + /** * Allocate a new AVFrame, reusing old buffers from the pool when available. * This function may be called simultaneously from multiple threads. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
