Merge commit '81737f42c28858dad76a40284a35f7a64faa2fc7'

[ffmpeg] / libavfilter / vsrc_testsrc.c

diff --git a/libavfilter/vsrc_testsrc.c b/libavfilter/vsrc_testsrc.c
index 1fca3e71eed804a07f813103ed6691637fe3b186..54d8b26ebbbf29bb4a558dc0b00a61b0ddf80bbb 100644 (file)
--- a/libavfilter/vsrc_testsrc.c
+++ b/libavfilter/vsrc_testsrc.c
@@ -615,7 +615,7 @@ static void test_fill_picture(AVFilterContext *ctx, AVFrame *frame)
     if (seg_size >= 1 && height >= 13 * seg_size) {
         int64_t p10decimals = 1;
         double time = av_q2d(test->time_base) * test->nb_frame *
-                      pow(10, test->nb_decimals);
+                      ff_exp10(test->nb_decimals);
         if (time >= INT_MAX)
             return;
 
@@ -1145,9 +1145,9 @@ static void draw_bar(TestSourceContext *test, const uint8_t color[4],
 
         if (plane == 1 || plane == 2) {
             px = x >> desc->log2_chroma_w;
-            pw = FF_CEIL_RSHIFT(w, desc->log2_chroma_w);
+            pw = AV_CEIL_RSHIFT(w, desc->log2_chroma_w);
             py = y >> desc->log2_chroma_h;
-            ph = FF_CEIL_RSHIFT(h, desc->log2_chroma_h);
+            ph = AV_CEIL_RSHIFT(h, desc->log2_chroma_h);
         } else {
             px = x;
             pw = w;