Unbreak ffplay -s and ffplay -pix_fmt.

This commit is contained in:
Carl Eugen Hoyos 2011-08-01 00:40:28 +02:00
parent 8460b757c2
commit 940a116b1f
2 changed files with 9 additions and 10 deletions

View File

@ -38,8 +38,9 @@ Force displayed width.
@item -y @var{height} @item -y @var{height}
Force displayed height. Force displayed height.
@item -s @var{size} @item -s @var{size}
This option has been removed. Use private format options for specifying the Set frame size (WxH or abbreviation), needed for videos which do
input video size. not contain a header with the frame size like raw YUV. This option
has been deprecated in favor of private options, try -video_size.
@item -an @item -an
Disable audio. Disable audio.
@item -vn @item -vn
@ -89,8 +90,8 @@ Read @var{input_file}.
@section Advanced options @section Advanced options
@table @option @table @option
@item -pix_fmt @var{format} @item -pix_fmt @var{format}
This option has been removed. Use private options for specifying the Set pixel format.
input pixel format. This option has been deprecated in favor of private options, try -pixel_format.
@item -stats @item -stats
Show the stream duration, the codec parameters, the current position in Show the stream duration, the codec parameters, the current position in
the stream and the audio/video synchronisation drift. the stream and the audio/video synchronisation drift.

View File

@ -2811,9 +2811,8 @@ static void event_loop(void)
static int opt_frame_size(const char *opt, const char *arg) static int opt_frame_size(const char *opt, const char *arg)
{ {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n");
"Option '%s' has been removed, use private format options instead\n", opt); return opt_default("video_size", arg);
return AVERROR(EINVAL);
} }
static int opt_width(const char *opt, const char *arg) static int opt_width(const char *opt, const char *arg)
@ -2840,9 +2839,8 @@ static int opt_format(const char *opt, const char *arg)
static int opt_frame_pix_fmt(const char *opt, const char *arg) static int opt_frame_pix_fmt(const char *opt, const char *arg)
{ {
av_log(NULL, AV_LOG_ERROR, av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n");
"Option '%s' has been removed, use private format options instead\n", opt); return opt_default("pixel_format", arg);
return AVERROR(EINVAL);
} }
static int opt_sync(const char *opt, const char *arg) static int opt_sync(const char *opt, const char *arg)