diff options
| author | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-12 13:25:52 +0000 |
|---|---|---|
| committer | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-12 13:25:52 +0000 |
| commit | 3b8074ebf586233b1a00ef479e667d00183ce7c3 (patch) | |
| tree | 3cddabfd39b35d24cb850f0fe81d4f6dd1eabe2e | |
| parent | 89d2f5be6c27b7a934fb1775d00da706adf36de9 (diff) | |
| download | mpv-3b8074ebf586233b1a00ef479e667d00183ce7c3.tar.bz2 mpv-3b8074ebf586233b1a00ef479e667d00183ce7c3.tar.xz | |
From: Kir Kostuchenko <kir@users.sourceforge.net>
Hi, I found that command line options brightness, hue, contrast and
saturation does not works, becouse mplayer apply it, before open tv
(kernel says invalid ioctl). Here are simple fix. Please apply.
This is the correct patch, sorry for the confusion.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10582 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpdemux/tv.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index b4d78e48cd..5a8e607a55 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -496,20 +496,12 @@ int demux_open_tv(demuxer_t *demuxer) /* set height */ funcs->control(tvh->priv, TVI_CONTROL_VID_GET_HEIGHT, &sh_video->disp_h); - /* set color eq */ - tv_set_color_options(tvh, TV_COLOR_BRIGHTNESS, tv_param_brightness); - tv_set_color_options(tvh, TV_COLOR_HUE, tv_param_hue); - tv_set_color_options(tvh, TV_COLOR_SATURATION, tv_param_saturation); - tv_set_color_options(tvh, TV_COLOR_CONTRAST, tv_param_contrast); - demuxer->video->sh = sh_video; sh_video->ds = demuxer->video; demuxer->video->id = 0; - demuxer->seekable = 0; /* here comes audio init */ - if (tv_param_noaudio == 0 && funcs->control(tvh->priv, TVI_CONTROL_IS_AUDIO, 0) == TVI_CONTROL_TRUE) { int audio_format; @@ -586,6 +578,13 @@ no_audio: tv_uninit(tvh); return 0; } + + /* set color eq */ + tv_set_color_options(tvh, TV_COLOR_BRIGHTNESS, tv_param_brightness); + tv_set_color_options(tvh, TV_COLOR_HUE, tv_param_hue); + tv_set_color_options(tvh, TV_COLOR_SATURATION, tv_param_saturation); + tv_set_color_options(tvh, TV_COLOR_CONTRAST, tv_param_contrast); + return 1; } |