[FFmpeg-cvslog] ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.

[Stefano Sabatini]

On date Sunday 2011-06-26 23:10:18 +0200, Baptiste Coudurier wrote:
> ffmpeg | branch: master | Baptiste Coudurier <baptiste.coudurier at gmail.com> | Sun Jun 26 14:01:00 2011 -0700| [90a40b226a5c90e48da8041294c3782de6ee61fc] | committer: Baptiste Coudurier
> 
> ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
> 
> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90a40b226a5c90e48da8041294c3782de6ee61fc
> ---
> 
>  ffmpeg.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ffmpeg.c b/ffmpeg.c
> index 80a67c1..f2716a3 100644
> --- a/ffmpeg.c
> +++ b/ffmpeg.c
> @@ -4071,13 +4071,13 @@ static void parse_matrix_coeffs(uint16_t *dest, const char *str)
>      }
>  }
>  
> -static void opt_inter_matrix(const char *arg)
> +static void opt_inter_matrix(const char *opt, const char *arg)

should return int (here and below).

>  {
>      inter_matrix = av_mallocz(sizeof(uint16_t) * 64);
>      parse_matrix_coeffs(inter_matrix, arg);
>  }
>  
> -static void opt_intra_matrix(const char *arg)
> +static void opt_intra_matrix(const char *opt, const char *arg)
>  {
>      intra_matrix = av_mallocz(sizeof(uint16_t) * 64);
>      parse_matrix_coeffs(intra_matrix, arg);
> @@ -4375,7 +4375,7 @@ static void log_callback_null(void* ptr, int level, const char* fmt, va_list vl)
>  {
>  }
>  
> -static void opt_passlogfile(const char *arg)
> +static void opt_passlogfile(const char *opt, const char *arg)
>  {
>      pass_logfilename_prefix = arg;
>      opt_default("passlogfile", arg);