avutil/opt: Do not print inf in selftest

This fixes fate failures on windows Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
mbouron · Mar 5, 2015 · 6d7e57e · 6d7e57e
1 parent d48c854
commit 6d7e57e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/libavutil/opt.c b/libavutil/opt.c
@@ -2123,11 +2123,15 @@ int main(void)
         av_log_set_level(AV_LOG_QUIET);
 
         for (i=0; i < FF_ARRAY_ELEMS(options); i++) {
+            int silence_log = !strcmp(options[i], "rational=-1/0"); // inf formating differs between platforms
             av_log(&test_ctx, AV_LOG_DEBUG, "Setting options string '%s'\n", options[i]);
+            if (silence_log)
+                av_log_set_callback(NULL);
             if (av_set_options_string(&test_ctx, options[i], "=", ":") < 0)
                 printf("Error '%s'\n", options[i]);
             else
                 printf("OK    '%s'\n", options[i]);
+            av_log_set_callback(log_callback_help);
         }
         av_opt_free(&test_ctx);
     }

diff --git a/tests/ref/fate/opt b/tests/ref/fate/opt
@@ -183,9 +183,6 @@ Value -1.000000 for parameter 'rational' out of range [0 - 10]
 Value -1.000000 for parameter 'rational' out of range [0 - 10]
 Error 'rational=0 : rational=1/2 : rational=1/-1'
 Setting options string 'rational=-1/0'
-Setting entry with key 'rational' to value '-1/0'
-Value -inf for parameter 'rational' out of range [0 - 10]
-Value -inf for parameter 'rational' out of range [0 - 10]
 Error 'rational=-1/0'
 Setting options string 'size=1024x768'
 Setting entry with key 'size' to value '1024x768'