aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-01 20:48:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-01 20:48:20 +0200
commitce9bd303794fcc94aa232c116bece13c5994b55b (patch)
tree6344fe1aaf86493b43b0be1ada1dd822ff8052a2 /ffmpeg.c
parent6a052e64b5d14ce2800eb45c699857347d9a78c9 (diff)
downloadffmpeg-ce9bd303794fcc94aa232c116bece13c5994b55b.tar.gz
ffmpeg: fix plain -profile support
Fixes Ticket387 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 6fcaa5b0ed..5e4fd667e2 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -5009,6 +5009,15 @@ static int opt_qscale(OptionsContext *o, const char *opt, const char *arg)
return ret;
}
+static int opt_profile(OptionsContext *o, const char *opt, const char *arg)
+{
+ if(!strcmp(opt, "profile")){
+ av_log(NULL, AV_LOG_WARNING, "Please use -profile:a or -profile:v, -profile is ambiguous\n");
+ return parse_option(o, "profile:v", arg, options);
+ }
+ return opt_default(opt, arg);
+}
+
static int opt_video_filters(OptionsContext *o, const char *opt, const char *arg)
{
return parse_option(o, "filter:v", arg, options);
@@ -5087,6 +5096,7 @@ static const OptionDef options[] = {
{ "tag", OPT_STRING | HAS_ARG | OPT_SPEC, {.off = OFFSET(codec_tags)}, "force codec tag/fourcc", "fourcc/tag" },
{ "q", HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC, {.off = OFFSET(qscale)}, "use fixed quality scale (VBR)", "q" },
{ "qscale", HAS_ARG | OPT_EXPERT | OPT_FUNC2, {(void*)opt_qscale}, "use fixed quality scale (VBR)", "q" },
+ { "profile", HAS_ARG | OPT_EXPERT | OPT_FUNC2, {(void*)opt_profile}, "set profile", "profile" },
#if CONFIG_AVFILTER
{ "filter", HAS_ARG | OPT_STRING | OPT_SPEC, {.off = OFFSET(filters)}, "set stream filterchain", "filter_list" },
#endif