[SCM] libav/experimental: Move log_callback_help to cmdutils.[hc], for allowing sharing.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 17:15:59 UTC 2013
The following commit has been merged in the experimental branch:
commit 1790d3b330800e8ec6844392aa501fb558ae25e1
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date: Mon Sep 20 21:48:03 2010 +0000
Move log_callback_help to cmdutils.[hc], for allowing sharing.
Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/cmdutils.c b/cmdutils.c
index a79c38e..382c6c1 100644
--- a/cmdutils.c
+++ b/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;
diff --git a/cmdutils.h b/cmdutils.h
index d48abab..68a29b4 100644
--- a/cmdutils.h
+++ b/cmdutils.h
@@ -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.
*/
diff --git a/ffmpeg.c b/ffmpeg.c
index 0a6964e..2c43494 100644
--- a/ffmpeg.c
+++ b/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");
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list