[FFmpeg-cvslog] r25358 - trunk/ffmpeg.c

[aurel]

Author: aurel
Date: Tue Oct  5 23:05:07 2010
New Revision: 25358

Log:
ffmpeg: Fix prototype of some OPT_FUNC2 functions. They must return an int.

Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Tue Oct  5 22:11:07 2010	(r25357)
+++ trunk/ffmpeg.c	Tue Oct  5 23:05:07 2010	(r25358)
@@ -3654,7 +3654,7 @@ static void new_subtitle_stream(AVFormat
     subtitle_stream_copy = 0;
 }
 
-static void opt_new_stream(const char *opt, const char *arg)
+static int opt_new_stream(const char *opt, const char *arg)
 {
     AVFormatContext *oc;
     if (nb_output_files <= 0) {
@@ -3667,10 +3667,11 @@ static void opt_new_stream(const char *o
     else if (!strcmp(opt, "newaudio"   )) new_audio_stream   (oc);
     else if (!strcmp(opt, "newsubtitle")) new_subtitle_stream(oc);
     else av_assert0(0);
+    return 0;
 }
 
 /* arg format is "output-stream-index:streamid-value". */
-static void opt_streamid(const char *opt, const char *arg)
+static int opt_streamid(const char *opt, const char *arg)
 {
     int idx;
     char *p;
@@ -3689,6 +3690,7 @@ static void opt_streamid(const char *opt
     idx = parse_number_or_die(opt, idx_str, OPT_INT, 0, MAX_STREAMS-1);
     streamid_map = grow_array(streamid_map, sizeof(*streamid_map), &nb_streamid_map, idx+1);
     streamid_map[idx] = parse_number_or_die(opt, p, OPT_INT, 0, INT_MAX);
+    return 0;
 }
 
 static void opt_output_file(const char *filename)