Mercurial > libavcodec.hg
comparison eval.c @ 7824:635ed2559262 libavcodec
Remove stuff under #if LIBAVCODEC_VERSION_INT.
author | michael |
---|---|
date | Mon, 08 Sep 2008 15:03:17 +0000 |
parents | 322023e630a6 |
children | 5de6db4225d6 |
comparison
equal
deleted
inserted
replaced
7823:4525dcd81357 | 7824:635ed2559262 |
---|---|
422 d = ff_parse_eval(e, const_value, opaque); | 422 d = ff_parse_eval(e, const_value, opaque); |
423 ff_eval_free(e); | 423 ff_eval_free(e); |
424 return d; | 424 return d; |
425 } | 425 } |
426 | 426 |
427 #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) | |
428 attribute_deprecated double ff_eval(char *s, double *const_value, const char **const_name, | |
429 double (**func1)(void *, double), const char **func1_name, | |
430 double (**func2)(void *, double, double), char **func2_name, | |
431 void *opaque){ | |
432 const char *error=NULL; | |
433 double ret; | |
434 ret = ff_eval2(s, const_value, const_name, func1, func1_name, func2, func2_name, opaque, &error); | |
435 if (error) | |
436 av_log(NULL, AV_LOG_ERROR, "Error evaluating \"%s\": %s\n", s, error); | |
437 return ret; | |
438 } | |
439 #endif | |
440 | |
441 #ifdef TEST | 427 #ifdef TEST |
442 #undef printf | 428 #undef printf |
443 static double const_values[]={ | 429 static double const_values[]={ |
444 M_PI, | 430 M_PI, |
445 M_E, | 431 M_E, |