summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRudolf Polzer <divverent@xonotic.org>2013-06-09 15:37:28 +0200
committerRudolf Polzer <divverent@xonotic.org>2013-06-09 15:37:28 +0200
commit0cbc75c0834a4ba93b67a79467b80324b06165f4 (patch)
tree74ad6b13f0b921a3fcec74743ee740952c3600df /core
parent4af59abbb416a365a98efca8875c0f0c1b0c872f (diff)
downloadmpv-0cbc75c0834a4ba93b67a79467b80324b06165f4.tar.bz2
mpv-0cbc75c0834a4ba93b67a79467b80324b06165f4.tar.xz
Option -omaxfps: limit fps when encoding
Lower-fps content is left alone (NOT aligned to this fps); higher fps content is decimated to this frame rate.
Diffstat (limited to 'core')
-rw-r--r--core/options.c1
-rw-r--r--core/options.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/options.c b/core/options.c
index 79d1370e7e..60eb86a448 100644
--- a/core/options.c
+++ b/core/options.c
@@ -709,6 +709,7 @@ const m_option_t mp_opts[] = {
OPT_STRING("of", encode_output.format, CONF_GLOBAL),
OPT_STRINGLIST("ofopts*", encode_output.fopts, CONF_GLOBAL),
OPT_FLOATRANGE("ofps", encode_output.fps, CONF_GLOBAL, 0.0, 1000000.0),
+ OPT_FLOATRANGE("omaxfps", encode_output.maxfps, CONF_GLOBAL, 0.0, 1000000.0),
OPT_STRING("ovc", encode_output.vcodec, CONF_GLOBAL),
OPT_STRINGLIST("ovcopts*", encode_output.vopts, CONF_GLOBAL),
OPT_STRING("oac", encode_output.acodec, CONF_GLOBAL),
diff --git a/core/options.h b/core/options.h
index 42955cd730..36af43e3f1 100644
--- a/core/options.h
+++ b/core/options.h
@@ -252,6 +252,7 @@ typedef struct MPOpts {
char *format;
char **fopts;
float fps;
+ float maxfps;
char *vcodec;
char **vopts;
char *acodec;