virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

ffplay: warn that -s is no longer working, suggest alternative

Browse Source 
Also remove now unused variables.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Stefano Sabatini 2011-07-16 23:08:06 +02:00 committed by Anton Khirnov
parent 25dfda7f31
commit a4e540c4f5
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/ffplay.texi
View File

@ -38,8 +38,8 @@ 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}
Set frame size (WxH or abbreviation), needed for videos which don't This option has been removed. Use private format options for specifying the
contain a header with the frame size like raw YUV. input video size.
@item -an @item -an
Disable audio. Disable audio.
@item -vn @item -vn

12
ffplay.c
View File

@ -226,8 +226,6 @@ static int fs_screen_width;
static int fs_screen_height; static int fs_screen_height;
static int screen_width = 0; static int screen_width = 0;
static int screen_height = 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 enum PixelFormat frame_pix_fmt = PIX_FMT_NONE;
static int audio_disable; static int audio_disable;
static int video_disable; static int video_disable;
@ -2823,16 +2821,10 @@ 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)
{ {
if (av_parse_video_size(&frame_width, &frame_height, arg) < 0) { av_log(NULL, AV_LOG_ERROR,
fprintf(stderr, "Incorrect frame size\n"); "Option '%s' has been removed, use private format options instead\n", opt);
return AVERROR(EINVAL); 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;
}
static int opt_width(const char *opt, const char *arg) static int opt_width(const char *opt, const char *arg)
{ {