Browse code

Do not pass program_name as argument to show_version(), this allows some future simplifications.

Originally committed as revision 13232 to svn://svn.ffmpeg.org/ffmpeg/trunk

Michael Niedermayer authored on 2008/05/22 08:36:32
Showing 5 changed files
... ...
@@ -216,7 +216,7 @@ void show_banner(const char *program_name, int program_birth_year)
216 216
 #endif
217 217
 }
218 218
 
219
-void show_version(const char *program_name) {
219
+void show_version(void) {
220 220
      /* TODO: add function interface to avutil and avformat avdevice*/
221 221
     printf("%s " FFMPEG_VERSION "\n", program_name);
222 222
     printf("libavutil   %d\n"
... ...
@@ -25,6 +25,11 @@
25 25
 #include <inttypes.h>
26 26
 
27 27
 /**
28
+ * program name, defined by the program for show_version().
29
+ */
30
+extern const char program_name[];
31
+
32
+/**
28 33
  * Parses a string and returns its corresponding value as a double.
29 34
  * Exits from the application if the string cannot be correctly
30 35
  * parsed or the corresponding value is invalid.
... ...
@@ -113,7 +118,7 @@ void show_banner(const char *program_name, int program_birth_year);
113 113
  * libraries.
114 114
  * @param program_name name of the program
115 115
  */
116
-void show_version(const char *program_name);
116
+void show_version(void);
117 117
 
118 118
 /**
119 119
  * Prints the license of the program to stdout. The license depends on
... ...
@@ -63,7 +63,7 @@
63 63
 
64 64
 #undef exit
65 65
 
66
-static const char program_name[] = "FFmpeg";
66
+const char program_name[] = "FFmpeg";
67 67
 static const int program_birth_year = 2000;
68 68
 
69 69
 /* select an input stream for an output stream */
... ...
@@ -3758,7 +3758,7 @@ static int opt_bsf(const char *opt, const char *arg)
3758 3758
 
3759 3759
 static void opt_show_version(void)
3760 3760
 {
3761
-    show_version(program_name);
3761
+    show_version();
3762 3762
     av_exit(0);
3763 3763
 }
3764 3764
 
... ...
@@ -39,7 +39,7 @@
39 39
 
40 40
 #undef exit
41 41
 
42
-static const char program_name[] = "FFplay";
42
+const char program_name[] = "FFplay";
43 43
 static const int program_birth_year = 2003;
44 44
 
45 45
 //#define DEBUG_SYNC
... ...
@@ -2440,7 +2440,7 @@ static void opt_show_help(void)
2440 2440
 
2441 2441
 static void opt_show_version(void)
2442 2442
 {
2443
-    show_version(program_name);
2443
+    show_version();
2444 2444
     exit(0);
2445 2445
 }
2446 2446
 
... ...
@@ -56,7 +56,7 @@
56 56
 
57 57
 #undef exit
58 58
 
59
-static const char program_name[] = "FFserver";
59
+const char program_name[] = "FFserver";
60 60
 static const int program_birth_year = 2000;
61 61
 
62 62
 static const OptionDef options[];