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

Baptiste Coudurier git at videolan.org
Wed Sep 7 15:16:21 CEST 2011


ffmpeg | branch: release/0.7 | Baptiste Coudurier <baptiste.coudurier at gmail.com> | Sun Jun 26 14:01:00 2011 -0700| [893cf1b1ae2bc9c7987d5015a421cd2e09d06443] | committer: Michael Niedermayer

ffmpeg: fix prototypes of functions after the removal of OPT_FUNC2.
(cherry picked from commit 90a40b226a5c90e48da8041294c3782de6ee61fc)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=893cf1b1ae2bc9c7987d5015a421cd2e09d06443
---

 ffmpeg.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index c6885d8..a00d94e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4074,13 +4074,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);
@@ -4378,7 +4378,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);



More information about the ffmpeg-cvslog mailing list