[FFmpeg-devel] Various small fixes

[Diego Biurrun]

On Sat, Dec 13, 2008 at 09:47:35PM +0100, Michael Niedermayer wrote:
> On Sat, Dec 13, 2008 at 05:20:21PM +0100, Anders Gr?nberg wrote:
> > On Sat, Dec 13, 2008 at 3:52 PM, M?ns Rullg?rd <mans at mansr.com> wrote:
> > > "Anders Gr?nberg" <galileo.m2 at gmail.com> writes:
> [...]
> > --- libavcodec/eval.c	(revision 16102)
> > +++ libavcodec/eval.c	(working copy)
> > @@ -47,12 +47,12 @@
> >  typedef struct Parser{
> >      int stack_index;
> >      char *s;
> > -    double *const_value;
> > -    const char **const_name;          // NULL terminated
> > +    const double *const_value;
> > +    const char * const *const_name;          // NULL terminated
> >      double (**func1)(void *, double a); // NULL terminated
> >      const char **func1_name;          // NULL terminated
> >      double (**func2)(void *, double a, double b); // NULL terminated
> > -    char **func2_name;          // NULL terminated
> > +    const char **func2_name;          // NULL terminated
> >      void *opaque;
> >      const char **error;
> >  #define VARS 10
> > @@ -375,9 +375,9 @@
> >      }
> >  }
> >  
> > -AVEvalExpr * ff_parse(const char *s, const char **const_name,
> > +AVEvalExpr * ff_parse(const char *s, const char * const *const_name,
> >                 double (**func1)(void *, double), const char **func1_name,
> > -               double (**func2)(void *, double, double), char **func2_name,
> > +               double (**func2)(void *, double, double), const char **func2_name,
> >                 const char **error){
> >      Parser p;
> >      AVEvalExpr * e;
> > @@ -404,7 +404,7 @@
> >      return e;
> >  }
> >  
> > -double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque) {
> > +double ff_parse_eval(AVEvalExpr * e, const double *const_value, void *opaque) {
> >      Parser p;
> >  
> >      p.const_value= const_value;
> > @@ -412,9 +412,9 @@
> >      return eval_expr(&p, e);
> >  }
> >  
> > -double ff_eval2(const char *s, double *const_value, const char **const_name,
> > +double ff_eval2(const char *s, const double *const_value, const char * const *const_name,
> >                 double (**func1)(void *, double), const char **func1_name,
> > -               double (**func2)(void *, double, double), char **func2_name,
> > +               double (**func2)(void *, double, double), const char **func2_name,
> >                 void *opaque, const char **error){
> >      AVEvalExpr * e = ff_parse(s, const_name, func1, func1_name, func2, func2_name, error);
> >      double d;
> > --- libavcodec/eval.h	(revision 16102)
> > +++ libavcodec/eval.h	(working copy)
> > @@ -42,9 +42,9 @@
> >   * @param opaque a pointer which will be passed to all functions from func1 and func2
> >   * @return the value of the expression
> >   */
> > -double ff_eval2(const char *s, double *const_value, const char **const_name,
> > +double ff_eval2(const char *s, const double *const_value, const char * const *const_name,
> >                 double (**func1)(void *, double), const char **func1_name,
> > -               double (**func2)(void *, double, double), char **func2_name,
> > +               double (**func2)(void *, double, double), const char **func2_name,
> >                 void *opaque, const char **error);
> >  
> >  typedef struct ff_expr_s AVEvalExpr;
> > @@ -61,9 +61,9 @@
> >   * @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(const char *s, const char **const_name,
> > +AVEvalExpr * ff_parse(const char *s, const char * const *const_name,
> >                 double (**func1)(void *, double), const char **func1_name,
> > -               double (**func2)(void *, double, double), char **func2_name,
> > +               double (**func2)(void *, double, double), const char **func2_name,
> >                 const char **error);
> >  /**
> >   * Evaluates a previously parsed expression.
> > @@ -71,7 +71,7 @@
> >   * @param opaque a pointer which will be passed to all functions from func1 and func2
> >   * @return the value of the expression
> >   */
> > -double ff_parse_eval(AVEvalExpr * e, double *const_value, void *opaque);
> > +double ff_parse_eval(AVEvalExpr * e, const double *const_value, void *opaque);
> >  void ff_eval_free(AVEvalExpr * e);
> >  
> >  #endif /* AVCODEC_EVAL_H */
> > --- libavcodec/h264.c	(revision 16102)
> > +++ libavcodec/h264.c	(working copy)
> > @@ -106,7 +106,7 @@
> >      const int mb_xy= h->mb_xy;
> >      int topleft_xy, top_xy, topright_xy, left_xy[2];
> >      int topleft_type, top_type, topright_type, left_type[2];
> > -    int * left_block;
> > +    const int * left_block;
> >      int topleft_partition= -1;
> >      int i;
> >  
> 
> this is probably ok

Applied.

> > --- libavcodec/imgconvert.c	(revision 16102)
> > +++ libavcodec/imgconvert.c	(working copy)
> > @@ -783,7 +783,7 @@
> >      dst_pix_fmt = -1;
> >      min_dist = 0x7fffffff;
> >      for(i = 0;i < PIX_FMT_NB; i++) {
> > -        if (pix_fmt_mask & (1 << i)) {
> > +        if (pix_fmt_mask & (1ULL << i)) {
> >              loss = avcodec_get_pix_fmt_loss(i, src_pix_fmt, has_alpha) & loss_mask;
> >              if (loss == 0) {
> >                  dist = avg_bits_per_pixel(i);
> 
> ok

Applied.

Diego