diff options
| author | Matthieu Bouron <matthieu.bouron@gmail.com> | 2016-05-10 17:45:59 +0200 |
|---|---|---|
| committer | Matthieu Bouron <mbouron@gopro.com> | 2017-01-12 10:22:52 +0100 |
| commit | b1f68f00b12a3706f8aabf68ea714eaecc23b295 (patch) | |
| tree | 352d9c9c3e776ecc2d2c61d32e2c17a1cd259922 /libavfilter/video.c | |
| parent | e71b8119e7db675dd2dac3f7fb069b0df2943c38 (diff) | |
| download | ffmpeg-b1f68f00b12a3706f8aabf68ea714eaecc23b295.tar.gz | |
lavfi/framepool: rename FFVideoFramePool to FFFramePool
Diffstat (limited to 'libavfilter/video.c')
| -rw-r--r-- | libavfilter/video.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libavfilter/video.c b/libavfilter/video.c index 2744be6360..fabdafd0d9 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -47,13 +47,13 @@ AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h) int pool_align = 0; enum AVPixelFormat pool_format = AV_PIX_FMT_NONE; - if (!link->video_frame_pool) { - link->video_frame_pool = ff_video_frame_pool_init(av_buffer_allocz, w, h, - link->format, BUFFER_ALIGN); - if (!link->video_frame_pool) + if (!link->frame_pool) { + link->frame_pool = ff_frame_pool_video_init(av_buffer_allocz, w, h, + link->format, BUFFER_ALIGN); + if (!link->frame_pool) return NULL; } else { - if (ff_video_frame_pool_get_config(link->video_frame_pool, + if (ff_frame_pool_get_video_config(link->frame_pool, &pool_width, &pool_height, &pool_format, &pool_align) < 0) { return NULL; @@ -62,15 +62,15 @@ AVFrame *ff_default_get_video_buffer(AVFilterLink *link, int w, int h) if (pool_width != w || pool_height != h || pool_format != link->format || pool_align != BUFFER_ALIGN) { - ff_video_frame_pool_uninit((FFVideoFramePool **)&link->video_frame_pool); - link->video_frame_pool = ff_video_frame_pool_init(av_buffer_allocz, w, h, - link->format, BUFFER_ALIGN); - if (!link->video_frame_pool) + ff_frame_pool_uninit((FFFramePool **)&link->frame_pool); + link->frame_pool = ff_frame_pool_video_init(av_buffer_allocz, w, h, + link->format, BUFFER_ALIGN); + if (!link->frame_pool) return NULL; } } - return ff_video_frame_pool_get(link->video_frame_pool); + return ff_frame_pool_get(link->frame_pool); } AVFrame *ff_get_video_buffer(AVFilterLink *link, int w, int h) |