[FFmpeg-cvslog] r13232 - in trunk: cmdutils.c cmdutils.h ffmpeg.c ffplay.c ffserver.c

[michael]

Author: michael
Date: Thu May 22 01:36:32 2008
New Revision: 13232

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


Modified:
   trunk/cmdutils.c
   trunk/cmdutils.h
   trunk/ffmpeg.c
   trunk/ffplay.c
   trunk/ffserver.c

Modified: trunk/cmdutils.c
==============================================================================
--- trunk/cmdutils.c	(original)
+++ trunk/cmdutils.c	Thu May 22 01:36:32 2008
@@ -216,7 +216,7 @@ void show_banner(const char *program_nam
 #endif
 }
 
-void show_version(const char *program_name) {
+void show_version(void) {
      /* TODO: add function interface to avutil and avformat avdevice*/
     printf("%s " FFMPEG_VERSION "\n", program_name);
     printf("libavutil   %d\n"

Modified: trunk/cmdutils.h
==============================================================================
--- trunk/cmdutils.h	(original)
+++ trunk/cmdutils.h	Thu May 22 01:36:32 2008
@@ -25,6 +25,11 @@
 #include <inttypes.h>
 
 /**
+ * program name, defined by the program for show_version().
+ */
+extern const char program_name[];
+
+/**
  * Parses a string and returns its corresponding value as a double.
  * Exits from the application if the string cannot be correctly
  * parsed or the corresponding value is invalid.
@@ -113,7 +118,7 @@ void show_banner(const char *program_nam
  * libraries.
  * @param program_name name of the program
  */
-void show_version(const char *program_name);
+void show_version(void);
 
 /**
  * Prints the license of the program to stdout. The license depends on

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Thu May 22 01:36:32 2008
@@ -63,7 +63,7 @@
 
 #undef exit
 
-static const char program_name[] = "FFmpeg";
+const char program_name[] = "FFmpeg";
 static const int program_birth_year = 2000;
 
 /* select an input stream for an output stream */
@@ -3758,7 +3758,7 @@ static int opt_bsf(const char *opt, cons
 
 static void opt_show_version(void)
 {
-    show_version(program_name);
+    show_version();
     av_exit(0);
 }
 

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	(original)
+++ trunk/ffplay.c	Thu May 22 01:36:32 2008
@@ -39,7 +39,7 @@
 
 #undef exit
 
-static const char program_name[] = "FFplay";
+const char program_name[] = "FFplay";
 static const int program_birth_year = 2003;
 
 //#define DEBUG_SYNC
@@ -2440,7 +2440,7 @@ static void opt_show_help(void)
 
 static void opt_show_version(void)
 {
-    show_version(program_name);
+    show_version();
     exit(0);
 }
 

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	(original)
+++ trunk/ffserver.c	Thu May 22 01:36:32 2008
@@ -56,7 +56,7 @@
 
 #undef exit
 
-static const char program_name[] = "FFserver";
+const char program_name[] = "FFserver";
 static const int program_birth_year = 2000;
 
 static const OptionDef options[];