diff options
| author | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-22 15:33:41 +0000 |
|---|---|---|
| committer | henry <henry@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-22 15:33:41 +0000 |
| commit | 2508ca0ccdbdf8d5e55c4b4f1f9ed0b2549fdd7d (patch) | |
| tree | 7591f659f705689dcefeef1ab7bad4a046d013b5 /libmpdemux | |
| parent | 3d100efa4164d6634fcb394a8ab565607922c59a (diff) | |
| download | mpv-2508ca0ccdbdf8d5e55c4b4f1f9ed0b2549fdd7d.tar.bz2 mpv-2508ca0ccdbdf8d5e55c4b4f1f9ed0b2549fdd7d.tar.xz | |
minor fixes in forceaudio option
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7845 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/tvi_v4l.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libmpdemux/tvi_v4l.c b/libmpdemux/tvi_v4l.c index 0602f5286a..52d7bb4226 100644 --- a/libmpdemux/tvi_v4l.c +++ b/libmpdemux/tvi_v4l.c @@ -515,7 +515,15 @@ static int init(priv_t *priv) else priv->audio_id = 0; audio_in_set_samplerate(&priv->audio_in, 44100); - audio_in_set_channels(&priv->audio_in, priv->audio_channels[priv->audio_id]); + if (priv->capability.audios) { + audio_in_set_channels(&priv->audio_in, priv->audio_channels[priv->audio_id]); + } else { + if (tv_param_forcechan >= 0) { + audio_in_set_channels(&priv->audio_in, tv_param_forcechan); + } else { + audio_in_set_channels(&priv->audio_in, 2); + } + } if (audio_in_setup(&priv->audio_in) < 0) return 0; setup_audio_buffer_sizes(priv); } |