From 74dc99f2b3567e697e2970391e4fe32ea1847c4f Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sun, 4 Jul 2010 20:59:00 +0000
Subject: [PATCH] Update help message for the -pad* options, as they have been
removed, and update the manual page accordingly.
Based on a patch by John Calcote $(echo "<kpio.dbmdpuf@hnbjm.dpn>" | tr "b-za" "a-z").
Originally committed as revision 24049 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
doc/ffmpeg-doc.texi | 10 ++--------
ffmpeg.c | 10 +++++-----
2 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 6eb3f9a65a..07d942afcc 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -235,18 +235,12 @@ Set left crop band size (in pixels).
@item -cropright @var{size} (deprecated - use -vf crop=width:height:x:y instead)
Set right crop band size (in pixels).
@item -padtop @var{size}
-Set top pad band size (in pixels).
@item -padbottom @var{size}
-Set bottom pad band size (in pixels).
@item -padleft @var{size}
-Set left pad band size (in pixels).
@item -padright @var{size}
-Set right pad band size (in pixels).
@item -padcolor @var{hex_color}
-Set color of padded bands. The value for padcolor is expressed
-as a six digit hexadecimal number where the first two digits
-represent red, the middle two digits green and last two digits
-blue (default = 000000 (black)).
+All the pad options have been removed. Use -vf
+pad=width:height:x:y:color instead.
@item -vn
Disable video recording.
@item -bt @var{tolerance}
diff --git a/ffmpeg.c b/ffmpeg.c
index 30a319c244..0d1c8a0254 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -4228,11 +4228,11 @@ static const OptionDef options[] = {
{ "cropbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_bottom}, "Deprecated, please use the crop avfilter", "size" },
{ "cropleft", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_left}, "Deprecated, please use the crop avfilter", "size" },
{ "cropright", HAS_ARG | OPT_VIDEO, {(void*)opt_frame_crop_right}, "Deprecated, please use the crop avfilter", "size" },
- { "padtop", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "set top pad band size (in pixels)", "size" },
- { "padbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "set bottom pad band size (in pixels)", "size" },
- { "padleft", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "set left pad band size (in pixels)", "size" },
- { "padright", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "set right pad band size (in pixels)", "size" },
- { "padcolor", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "set color of pad bands (Hex 000000 thru FFFFFF)", "color" },
+ { "padtop", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
+ { "padbottom", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
+ { "padleft", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
+ { "padright", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "size" },
+ { "padcolor", HAS_ARG | OPT_VIDEO, {(void*)opt_pad}, "Removed, use the pad filter instead", "color" },
{ "intra", OPT_BOOL | OPT_EXPERT | OPT_VIDEO, {(void*)&intra_only}, "use only intra frames"},
{ "vn", OPT_BOOL | OPT_VIDEO, {(void*)&video_disable}, "disable video" },
{ "vdt", OPT_INT | HAS_ARG | OPT_EXPERT | OPT_VIDEO, {(void*)&video_discard}, "discard threshold", "n" },