This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 38543781cc7411fb2b775d237f82973043d525f7 Author: Niklas Haas <[email protected]> AuthorDate: Sun Mar 29 16:58:04 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Fri Apr 10 15:12:18 2026 +0200 avfilter/framepool: move variable declarations to site of definition This is not C89 anymore. Signed-off-by: Niklas Haas <[email protected]> --- libavfilter/framepool.c | 36 +++++++++++++++--------------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c index 7b58fa95f8..f66b694d37 100644 --- a/libavfilter/framepool.c +++ b/libavfilter/framepool.c @@ -32,12 +32,9 @@ static av_cold FFFramePool *frame_pool_video_init(int width, int height, enum AVPixelFormat format, int align) { - int i, ret; - FFFramePool *pool; - ptrdiff_t linesizes[4]; - size_t sizes[4]; + int ret; - pool = av_mallocz(sizeof(FFFramePool)); + FFFramePool *pool = av_mallocz(sizeof(FFFramePool)); if (!pool) return NULL; @@ -57,19 +54,21 @@ static av_cold FFFramePool *frame_pool_video_init(int width, int height, goto fail; } - for (i = 0; i < 4 && pool->linesize[i]; i++) + for (int i = 0; i < 4 && pool->linesize[i]; i++) pool->linesize[i] = FFALIGN(pool->linesize[i], pool->align); - for (i = 0; i < 4; i++) + ptrdiff_t linesizes[4]; + for (int i = 0; i < 4; i++) linesizes[i] = pool->linesize[i]; + size_t sizes[4]; if (av_image_fill_plane_sizes(sizes, pool->pix_fmt, FFALIGN(pool->height, align), linesizes) < 0) { goto fail; } - for (i = 0; i < 4 && sizes[i]; i++) { + for (int i = 0; i < 4 && sizes[i]; i++) { if (sizes[i] > SIZE_MAX - align) goto fail; pool->pools[i] = av_buffer_pool_init(sizes[i] + align, @@ -91,14 +90,13 @@ static av_cold FFFramePool *frame_pool_audio_init(int channels, int nb_samples, enum AVSampleFormat format, int align) { - int ret, planar; - FFFramePool *pool; + int ret; - pool = av_mallocz(sizeof(FFFramePool)); + FFFramePool *pool = av_mallocz(sizeof(FFFramePool)); if (!pool) return NULL; - planar = av_sample_fmt_is_planar(format); + int planar = av_sample_fmt_is_planar(format); pool->type = AVMEDIA_TYPE_AUDIO; pool->planes = planar ? channels : 1; @@ -128,11 +126,9 @@ fail: AVFrame *ff_frame_pool_get(FFFramePool *pool) { - int i; - AVFrame *frame; const AVPixFmtDescriptor *desc; - frame = av_frame_alloc(); + AVFrame *frame = av_frame_alloc(); if (!frame) { return NULL; } @@ -148,7 +144,7 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool) frame->height = pool->height; frame->format = pool->pix_fmt; - for (i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { frame->linesize[i] = pool->linesize[i]; if (!pool->pools[i]) break; @@ -191,14 +187,14 @@ AVFrame *ff_frame_pool_get(FFFramePool *pool) av_assert0(frame->nb_extended_buf == 0); } - for (i = 0; i < FFMIN(pool->planes, AV_NUM_DATA_POINTERS); i++) { + for (int i = 0; i < FFMIN(pool->planes, AV_NUM_DATA_POINTERS); i++) { frame->buf[i] = av_buffer_pool_get(pool->pools[0]); if (!frame->buf[i]) goto fail; frame->extended_data[i] = frame->data[i] = (uint8_t *)FFALIGN((uintptr_t)frame->buf[i]->data, pool->align); } - for (i = 0; i < frame->nb_extended_buf; i++) { + for (int i = 0; i < frame->nb_extended_buf; i++) { frame->extended_buf[i] = av_buffer_pool_get(pool->pools[0]); if (!frame->extended_buf[i]) goto fail; @@ -219,12 +215,10 @@ fail: av_cold void ff_frame_pool_uninit(FFFramePool **pool) { - int i; - if (!*pool) return; - for (i = 0; i < 4; i++) { + for (int i = 0; i < 4; i++) { av_buffer_pool_uninit(&(*pool)->pools[i]); } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
