Mercurial > libavcodec.hg

changeset 11804:3dc6ee95d63a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics: reindent and break some overly long line.
author stefano
date Tue, 01 Jun 2010 08:07:17 +0000
parents f443ef5ec4e2
children 0448680fa221
files eval.c eval.h
diffstat 2 files changed, 15 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/eval.c	Tue Jun 01 08:07:15 2010 +0000
+++ b/eval.c	Tue Jun 01 08:07:17 2010 +0000
@@ -442,7 +442,7 @@
                   const char * const *const_names,
                   const char * const *func1_names, double (* const *funcs1)(void *, double),
                   const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                      int log_offset, void *log_ctx)
+                  int log_offset, void *log_ctx)
 {
     Parser p;
     AVExpr *e = NULL;
@@ -494,7 +494,7 @@
                            const char * const *const_names, const double *const_values,
                            const char * const *func1_names, double (* const *funcs1)(void *, double),
                            const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                              void *opaque, int log_offset, void *log_ctx)
+                           void *opaque, int log_offset, void *log_ctx)
 {
     AVExpr *e = NULL;
     int ret = ff_parse_expr(&e, s, const_names, func1_names, funcs1, func2_names, funcs2, log_offset, log_ctx);
@@ -515,23 +515,31 @@
     M_E,
     0
 };
+
 static const char *const_names[] = {
     "PI",
     "E",
     0
 };
+
 int main(void)
 {
     int i;
     double d;
-    ff_parse_and_eval_expr(&d, "1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL);
+    ff_parse_and_eval_expr(&d, "1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)",
+                           const_names, const_values,
+                           NULL, NULL, NULL, NULL, NULL, 0, NULL);
     printf("%f == 12.7\n", d);
-    ff_parse_and_eval_expr(&d, "80G/80Gi", const_names, const_values, NULL, NULL, NULL, NULL, NULL, NULL);
+    ff_parse_and_eval_expr(&d, "80G/80Gi",
+                           const_names, const_values,
+                           NULL, NULL, NULL, NULL, NULL, NULL);
     printf("%f == 0.931322575\n", d);
 
     for (i=0; i<1050; i++) {
         START_TIMER
-            ff_parse_and_eval_expr(&d, "1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)", const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL);
+            ff_parse_and_eval_expr(&d, "1+(5-2)^(3-1)+1/2+sin(PI)-max(-2.2,-3.1)",
+                                   const_names, const_values,
+                                   NULL, NULL, NULL, NULL, NULL, 0, NULL);
         STOP_TIMER("ff_parse_and_eval_expr")
     }
     return 0;
--- a/eval.h	Tue Jun 01 08:07:15 2010 +0000
+++ b/eval.h	Tue Jun 01 08:07:17 2010 +0000
@@ -50,7 +50,7 @@
                            const char * const *const_names, const double *const_values,
                            const char * const *func1_names, double (* const *funcs1)(void *, double),
                            const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                              void *opaque, int log_offset, void *log_ctx);
+                           void *opaque, int log_offset, void *log_ctx);
 
 /**
  * Parses an expression.
@@ -73,7 +73,7 @@
                   const char * const *const_names,
                   const char * const *func1_names, double (* const *funcs1)(void *, double),
                   const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                      int log_offset, void *log_ctx);
+                  int log_offset, void *log_ctx);
 
 /**
  * Evaluates a previously parsed expression.