| Message ID | 20220303170548.2606-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | ee88804d07c145bc7bca40c94bf6fd4cf71c06e4 |
| Headers | show |
| Series | [FFmpeg-devel] avfilter/framepool: remove superfluous pallete buffer allocation | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
On 3/3/22, James Almer <jamrial@gmail.com> wrote: > av_image_fill_plane_sizes() already sets sizes[1] to AVPALETTE_SIZE. > Should fix memory leaks. ok > > Signed-off-by: James Almer <jamrial@gmail.com> > --- > Sorry for not noticing this before. > > libavfilter/framepool.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c > index 96bfe46319..1990902666 100644 > --- a/libavfilter/framepool.c > +++ b/libavfilter/framepool.c > @@ -56,13 +56,9 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* > (*alloc)(size_t size), > { > int i, ret; > FFFramePool *pool; > - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format); > ptrdiff_t linesizes[4]; > size_t sizes[4]; > > - if (!desc) > - return NULL; > - > pool = av_mallocz(sizeof(FFFramePool)); > if (!pool) > return NULL; > @@ -108,12 +104,6 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* > (*alloc)(size_t size), > goto fail; > } > > - if (desc->flags & AV_PIX_FMT_FLAG_PAL) { > - pool->pools[1] = av_buffer_pool_init(AVPALETTE_SIZE, alloc); > - if (!pool->pools[1]) > - goto fail; > - } > - > return pool; > > fail: > -- > 2.35.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c index 96bfe46319..1990902666 100644 --- a/libavfilter/framepool.c +++ b/libavfilter/framepool.c @@ -56,13 +56,9 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size), { int i, ret; FFFramePool *pool; - const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(format); ptrdiff_t linesizes[4]; size_t sizes[4]; - if (!desc) - return NULL; - pool = av_mallocz(sizeof(FFFramePool)); if (!pool) return NULL; @@ -108,12 +104,6 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size), goto fail; } - if (desc->flags & AV_PIX_FMT_FLAG_PAL) { - pool->pools[1] = av_buffer_pool_init(AVPALETTE_SIZE, alloc); - if (!pool->pools[1]) - goto fail; - } - return pool; fail:
av_image_fill_plane_sizes() already sets sizes[1] to AVPALETTE_SIZE. Should fix memory leaks. Signed-off-by: James Almer <jamrial@gmail.com> --- Sorry for not noticing this before. libavfilter/framepool.c | 10 ---------- 1 file changed, 10 deletions(-)