aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-07-16 22:43:11 +0200
committerAnton Khirnov <anton@khirnov.net>2011-07-17 07:00:53 +0200
commit0a858048af695e0d5788f0613fc2dc490572e1de (patch)
tree5cb2066d40cefa2afae6cfebba076f8fe2fca772
parenta4e540c4f58f4c3b8d2cd924d6cd7ebf8183b074 (diff)
downloadffmpeg-0a858048af695e0d5788f0613fc2dc490572e1de.tar.gz
ffplay: warn that -pix_fmt is no longer working, suggest alternative
Also remove now unused variable. Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--doc/ffplay.texi3
-rw-r--r--ffplay.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index 8e40c8fd3d..d60852603a 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -69,7 +69,8 @@ also sources and sinks).
@section Advanced options
@table @option
@item -pix_fmt @var{format}
-Set pixel format.
+This option has been removed. Use private options for specifying the
+input 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 35c40b5263..77c9d4b2f3 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -226,7 +226,6 @@ static int fs_screen_width;
static int fs_screen_height;
static int screen_width = 0;
static int screen_height = 0;
-static enum PixelFormat frame_pix_fmt = PIX_FMT_NONE;
static int audio_disable;
static int video_disable;
static int wanted_stream[AVMEDIA_TYPE_NB]={
@@ -2850,8 +2849,9 @@ static int opt_format(const char *opt, const char *arg)
static int opt_frame_pix_fmt(const char *opt, const char *arg)
{
- frame_pix_fmt = av_get_pix_fmt(arg);
- return 0;
+ av_log(NULL, AV_LOG_ERROR,
+ "Option '%s' has been removed, use private format options instead\n", opt);
+ return AVERROR(EINVAL);
}
static int opt_sync(const char *opt, const char *arg)