aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-06-26 14:01:00 -0700
committerMichael Niedermayer <michaelni@gmx.at>2011-07-27 23:54:34 +0200
commitb55b34f86218fcd46629b85f27cba3265f2dd62f (patch)
treed9d7e7ca7ecc71ac0756f9b3e8bdb1e3af0c17b3
parent609d299ed06c2b00cc289129e0de7b2d57b2ab3d (diff)
downloadffmpeg-b55b34f86218fcd46629b85f27cba3265f2dd62f.tar.gz
ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
(cherry picked from commit 90a40b226a5c90e48da8041294c3782de6ee61fc)
-rw-r--r--ffmpeg.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index acd4b36a2c..3a1a150b6c 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4075,13 +4075,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)
{
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);
@@ -4379,7 +4379,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);