Browse Source

Move log_callback_help to cmdutils.[hc], for allowing sharing.

Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
Stefano Sabatini 14 years ago
parent
commit
1790d3b330
3 changed files with 11 additions and 9 deletions
  1. 5 0
      cmdutils.c
  2. 6 0
      cmdutils.h
  3. 0 9
      ffmpeg.c

+ 5 - 0
cmdutils.c

@@ -56,6 +56,11 @@ struct SwsContext *sws_opts;
 
 const int this_year = 2010;
 
+void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)
+{
+    vfprintf(stdout, fmt, vl);
+}
+
 double parse_number_or_die(const char *context, const char *numstr, int type, double min, double max)
 {
     char *tail;

+ 6 - 0
cmdutils.h

@@ -44,6 +44,12 @@ extern AVCodecContext *avcodec_opts[AVMEDIA_TYPE_NB];
 extern AVFormatContext *avformat_opts;
 extern struct SwsContext *sws_opts;
 
+/**
+ * Trivial log callback.
+ * Only suitable for show_help and similar since it lacks prefix handling.
+ */
+void log_callback_help(void* ptr, int level, const char* fmt, va_list vl);
+
 /**
  * Fallback for options that are not explicitly handled, these will be
  * parsed through AVOptions.

+ 0 - 9
ffmpeg.c

@@ -3870,15 +3870,6 @@ static void opt_intra_matrix(const char *arg)
     parse_matrix_coeffs(intra_matrix, arg);
 }
 
-/**
- * Trivial log callback.
- * Only suitable for show_help and similar since it lacks prefix handling.
- */
-static void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)
-{
-    vfprintf(stdout, fmt, vl);
-}
-
 static void show_usage(void)
 {
     printf("Hyper fast Audio and Video encoder\n");