diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-07-16 23:08:06 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-07-17 07:00:37 +0200 |
| commit | a4e540c4f58f4c3b8d2cd924d6cd7ebf8183b074 (patch) | |
| tree | b6ab342b03297bae39bc7af8815e110298f7f28b | |
| parent | 25dfda7f318c570990aab5f699b9cb3e22bcd4c6 (diff) | |
| download | ffmpeg-a4e540c4f58f4c3b8d2cd924d6cd7ebf8183b074.tar.gz | |
ffplay: warn that -s is no longer working, suggest alternative
Also remove now unused variables.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | doc/ffplay.texi | 4 | ||||
| -rw-r--r-- | ffplay.c | 14 |
2 files changed, 5 insertions, 13 deletions
diff --git a/doc/ffplay.texi b/doc/ffplay.texi index e5de3d2d6d..8e40c8fd3d 100644 --- a/doc/ffplay.texi +++ b/doc/ffplay.texi @@ -38,8 +38,8 @@ Force displayed width. @item -y @var{height} Force displayed height. @item -s @var{size} -Set frame size (WxH or abbreviation), needed for videos which don't -contain a header with the frame size like raw YUV. +This option has been removed. Use private format options for specifying the +input video size. @item -an Disable audio. @item -vn @@ -226,8 +226,6 @@ static int fs_screen_width; static int fs_screen_height; static int screen_width = 0; static int screen_height = 0; -static int frame_width = 0; -static int frame_height = 0; static enum PixelFormat frame_pix_fmt = PIX_FMT_NONE; static int audio_disable; static int video_disable; @@ -2823,15 +2821,9 @@ static void event_loop(void) static int opt_frame_size(const char *opt, const char *arg) { - if (av_parse_video_size(&frame_width, &frame_height, arg) < 0) { - fprintf(stderr, "Incorrect frame size\n"); - return AVERROR(EINVAL); - } - if ((frame_width % 2) != 0 || (frame_height % 2) != 0) { - fprintf(stderr, "Frame size must be a multiple of 2\n"); - return AVERROR(EINVAL); - } - 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_width(const char *opt, const char *arg) |