Browse Source

Fix

utils.c: In function ‘avcodec_get_context_defaults2’:
utils.c:793: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 11938 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Luca Abeni 17 years ago
parent
commit
6881b8e567
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      libavcodec/avcodec.h
  2. +2
    -2
      libavcodec/eval.c
  3. +2
    -2
      libavcodec/eval.h

+ 1
- 1
libavcodec/avcodec.h View File

@@ -1197,7 +1197,7 @@ typedef struct AVCodecContext {
* - encoding: Set by user
* - decoding: unused
*/
char *rc_eq;
const char *rc_eq;

/**
* maximum bitrate


+ 2
- 2
libavcodec/eval.c View File

@@ -376,7 +376,7 @@ static int verify_expr(AVEvalExpr * e) {
}
}

AVEvalExpr * ff_parse(char *s, const char **const_name,
AVEvalExpr * ff_parse(const char *s, const char **const_name,
double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name,
const char **error){
@@ -413,7 +413,7 @@ double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque) {
return eval_expr(&p, e);
}

double ff_eval2(char *s, double *const_value, const char **const_name,
double ff_eval2(const 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, const char **error){


+ 2
- 2
libavcodec/eval.h View File

@@ -52,7 +52,7 @@ double ff_eval(char *s, double *const_value, const char **const_name,
* @param opaque a pointer which will be passed to all functions from func1 and func2
* @return the value of the expression
*/
double ff_eval2(char *s, double *const_value, const char **const_name,
double ff_eval2(const 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, const char **error);
@@ -71,7 +71,7 @@ typedef struct ff_expr_s AVEvalExpr;
* @return AVEvalExpr which must be freed with ff_eval_free by the user when it is not needed anymore
* NULL if anything went wrong
*/
AVEvalExpr * ff_parse(char *s, const char **const_name,
AVEvalExpr * ff_parse(const char *s, const char **const_name,
double (**func1)(void *, double), const char **func1_name,
double (**func2)(void *, double, double), char **func2_name,
const char **error);


Loading…
Cancel
Save