Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

ffmpeg: remove -crop* and -pad* options

Browse Source 
The options have been deprecated and are non-operational since more than
two years.
pull/9/head
Stefano Sabatini 12 years ago
parent 43af18ef8b
commit 27db2bf000
2 changed files with 0 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      doc/ffmpeg.texi
  2. 30
      ffmpeg_opt.c

15
doc/ffmpeg.texi
Unescape View File

@ -451,21 +451,6 @@ form @var{num}:@var{den}, where @var{num} and @var{den} are the
numerator and denominator of the aspect ratio. For example "4:3",
"16:9", "1.3333", and "1.7777" are valid argument values.
@item -croptop @var{size}
@item -cropbottom @var{size}
@item -cropleft @var{size}
@item -cropright @var{size}
All the crop options have been removed. Use -vf
crop=width:height:x:y instead.
@item -padtop @var{size}
@item -padbottom @var{size}
@item -padleft @var{size}
@item -padright @var{size}
@item -padcolor @var{hex_color}
All the pad options have been removed. Use -vf
pad=width:height:x:y:color instead.
@item -vn (@emph{output})
Disable video recording.

30
ffmpeg_opt.c
Unescape View File

@ -149,18 +149,6 @@ static void init_options(OptionsContext *o, int is_input)
o->chapters_input_file = INT_MAX;
}
static int opt_frame_crop(void *optctx, const char *opt, const char *arg)
{
av_log(NULL, AV_LOG_FATAL, "Option '%s' has been removed, use the crop filter instead\n", opt);
return AVERROR(EINVAL);
}
static int opt_pad(void *optctx, const char *opt, const char *arg)
{
av_log(NULL, AV_LOG_FATAL, "Option '%s' has been removed, use the pad filter instead\n", opt);
return -1;
}
static int opt_sameq(void *optctx, const char *opt, const char *arg)
{
av_log(NULL, AV_LOG_ERROR, "Option '%s' was removed. "
@ -2490,24 +2478,6 @@ const OptionDef options[] = {
"set pixel format", "format" },
{ "bits_per_raw_sample", OPT_VIDEO | OPT_INT | HAS_ARG, { &frame_bits_per_raw_sample },
"set the number of bits per raw sample", "number" },
{ "croptop", OPT_VIDEO | HAS_ARG, { .func_arg = opt_frame_crop },
"Removed, use the crop filter instead", "size" },
{ "cropbottom", OPT_VIDEO | HAS_ARG, { .func_arg = opt_frame_crop },
"Removed, use the crop filter instead", "size" },
{ "cropleft", OPT_VIDEO | HAS_ARG, { .func_arg = opt_frame_crop },
"Removed, use the crop filter instead", "size" },
{ "cropright", OPT_VIDEO | HAS_ARG, { .func_arg = opt_frame_crop },
"Removed, use the crop filter instead", "size" },
{ "padtop", OPT_VIDEO | HAS_ARG, { .func_arg = opt_pad },
"Removed, use the pad filter instead", "size" },
{ "padbottom", OPT_VIDEO | HAS_ARG, { .func_arg = opt_pad },
"Removed, use the pad filter instead", "size" },
{ "padleft", OPT_VIDEO | HAS_ARG, { .func_arg = opt_pad },
"Removed, use the pad filter instead", "size" },
{ "padright", OPT_VIDEO | HAS_ARG, { .func_arg = opt_pad },
"Removed, use the pad filter instead", "size" },
{ "padcolor", OPT_VIDEO | HAS_ARG, { .func_arg = opt_pad },
"Removed, use the pad filter instead", "color" },
{ "intra", OPT_VIDEO | OPT_BOOL | OPT_EXPERT, { &intra_only },
"deprecated use -g 1" },
{ "vn", OPT_VIDEO | OPT_BOOL | OPT_OFFSET, { .off = OFFSET(video_disable) },

Write Preview
Loading…
Cancel
Save