[FFmpeg-cvslog] r25149 - in trunk: cmdutils.c cmdutils.h ffmpeg.c

[stefano]

Author: stefano
Date: Mon Sep 20 23:48:03 2010
New Revision: 25149

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

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

Modified: trunk/cmdutils.c
==============================================================================
--- trunk/cmdutils.c	Mon Sep 20 13:34:27 2010	(r25148)
+++ trunk/cmdutils.c	Mon Sep 20 23:48:03 2010	(r25149)
@@ -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;

Modified: trunk/cmdutils.h
==============================================================================
--- trunk/cmdutils.h	Mon Sep 20 13:34:27 2010	(r25148)
+++ trunk/cmdutils.h	Mon Sep 20 23:48:03 2010	(r25149)
@@ -45,6 +45,12 @@ 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.
  */

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Sep 20 13:34:27 2010	(r25148)
+++ trunk/ffmpeg.c	Mon Sep 20 23:48:03 2010	(r25149)
@@ -3870,15 +3870,6 @@ static void opt_intra_matrix(const char 
     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");