[FFmpeg-cvslog] Unbreak ffplay -s and ffplay -pix_fmt.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Mon Aug  1 00:40:28 2011 +0200| [940a116b1f441b90e49886bfc07e0137ae342d5a] | committer: Carl Eugen Hoyos

Unbreak ffplay -s and ffplay -pix_fmt.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=940a116b1f441b90e49886bfc07e0137ae342d5a
---

 doc/ffplay.texi |    9 +++++----
 ffplay.c        |   10 ++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index 44fbad1..9390e14 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -38,8 +38,9 @@ Force displayed width.
 @item -y @var{height}
 Force displayed height.
 @item -s @var{size}
-This option has been removed. Use private format options for specifying the
-input video size.
+Set frame size (WxH or abbreviation), needed for videos which do
+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
 Disable audio.
 @item -vn
@@ -89,8 +90,8 @@ Read @var{input_file}.
 @section Advanced options
 @table @option
 @item -pix_fmt @var{format}
-This option has been removed. Use private options for specifying the
-input pixel format.
+Set pixel format.
+This option has been deprecated in favor of private options, try -pixel_format.
 @item -stats
 Show the stream duration, the codec parameters, the current position in
 the stream and the audio/video synchronisation drift.
diff --git a/ffplay.c b/ffplay.c
index eb9d81b..ed1bdf4 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2811,9 +2811,8 @@ static void event_loop(void)
 
 static int opt_frame_size(const char *opt, const char *arg)
 {
-    av_log(NULL, AV_LOG_ERROR,
-           "Option '%s' has been removed, use private format options instead\n", opt);
-    return AVERROR(EINVAL);
+    av_log(NULL, AV_LOG_WARNING, "Option -s is deprecated, use -video_size.\n");
+    return opt_default("video_size", 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)
 {
-    av_log(NULL, AV_LOG_ERROR,
-           "Option '%s' has been removed, use private format options instead\n", opt);
-    return AVERROR(EINVAL);
+    av_log(NULL, AV_LOG_WARNING, "Option -pix_fmt is deprecated, use -pixel_format.\n");
+    return opt_default("pixel_format", arg);
 }
 
 static int opt_sync(const char *opt, const char *arg)