highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* static,const,compiler warning cleanup

Browse Source 
Originally committed as revision 1567 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Zdenek Kabelac
2003-02-10 09:35:32 +00:00
parent cd66005dda
commit 5c91a6755b
27 changed files with 150 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/eval.c
View File

@ -23,6 +23,9 @@
* see http://joe.hotchkiss.com/programming/eval/eval.html
*/
#include "avcodec.h"
#include "mpegvideo.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -43,9 +46,9 @@ typedef struct Parser{
int stack_index;
char *s;
double *const_value;
char **const_name; // NULL terminated
const char **const_name; // NULL terminated
double (**func1)(void *, double a); // NULL terminated
char **func1_name; // NULL terminated
const char **func1_name; // NULL terminated
double (**func2)(void *, double a, double b); // NULL terminated
char **func2_name; // NULL terminated
void *opaque;
@ -71,7 +74,7 @@ static double pop(Parser *p){
return p->stack[ --p->stack_index ];
}
static int strmatch(char *s, char *prefix){
static int strmatch(const char *s, const char *prefix){
int i;
for(i=0; prefix[i]; i++){
if(prefix[i] != s[i]) return 0;
@ -126,7 +129,7 @@ static void evalPrimary(Parser *p){
else if( strmatch(next, "log" ) ) d= log(d);
else if( strmatch(next, "squish") ) d= 1/(1+exp(4*d));
else if( strmatch(next, "gauss" ) ) d= exp(-d*d/2)/sqrt(2*M_PI);
else if( strmatch(next, "abs" ) ) d= abs(d);
else if( strmatch(next, "abs" ) ) d= fabs(d);
else if( strmatch(next, "max" ) ) d= d > d2 ? d : d2;
else if( strmatch(next, "min" ) ) d= d < d2 ? d : d2;
else if( strmatch(next, "gt" ) ) d= d > d2 ? 1.0 : 0.0;
@ -228,8 +231,8 @@ static void evalExpression(Parser *p){
}
}
double ff_eval(char *s, double *const_value, char **const_name,
double (**func1)(void *, double), char **func1_name,
double ff_eval(char *s, double *const_value, const char **const_name,
double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name,
void *opaque){
Parser p;