opus_rc: rename total_bits_used to total_bits and #define some constants

[ffmpeg] / libavfilter / video.c

diff --git a/libavfilter/video.c b/libavfilter/video.c
index 2744be6360da3b51a78bf69a9217b26fa4795bad..fabdafd0d979edf9247185697d94a8abb1b4d6b0 100644 (file)
--- 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)