Commit fef5548a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

ALSA: fix S/PDIF output (hopefully)

Do not clobber the output format channels to stereo. This would break
the VLC filtering pipeline.
(cherry picked from commit ea6e934a)
parent d205a789
...@@ -553,8 +553,6 @@ static int Open (vlc_object_t *obj) ...@@ -553,8 +553,6 @@ static int Open (vlc_object_t *obj)
/* Setup audio_output_t */ /* Setup audio_output_t */
aout->format.i_format = fourcc; aout->format.i_format = fourcc;
aout->format.i_rate = rate; aout->format.i_rate = rate;
aout->format.i_original_channels =
aout->format.i_physical_channels = chans;
if (spdif) if (spdif)
{ {
aout->format.i_bytes_per_frame = AOUT_SPDIF_SIZE; aout->format.i_bytes_per_frame = AOUT_SPDIF_SIZE;
...@@ -562,7 +560,11 @@ static int Open (vlc_object_t *obj) ...@@ -562,7 +560,11 @@ static int Open (vlc_object_t *obj)
aout_VolumeNoneInit (aout); aout_VolumeNoneInit (aout);
} }
else else
{
aout->format.i_original_channels =
aout->format.i_physical_channels = chans;
aout_VolumeSoftInit (aout); aout_VolumeSoftInit (aout);
}
aout->pf_play = Play; aout->pf_play = Play;
if (snd_pcm_hw_params_can_pause (hw)) if (snd_pcm_hw_params_can_pause (hw))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment