diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-04-23 15:30:50 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-02-20 09:18:29 +0100 |
| commit | 0bbe5ac82ef2845efafbf190044f16712db113b2 (patch) | |
| tree | ac8745fba01c8a3e902e886f46f90ad56576559f /src/output/pulse_output_plugin.c | |
| parent | c69c8ffa9ec55c94dee7ce69af26b4edbd61647e (diff) | |
Switch to Libav sample formats everywhere.
Drop 24bit format for now. It should be restored later by properly
distinguishing between internal and packed formats.
Diffstat (limited to 'src/output/pulse_output_plugin.c')
| -rw-r--r-- | src/output/pulse_output_plugin.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/output/pulse_output_plugin.c b/src/output/pulse_output_plugin.c index 0dc9be0e..5f8ef1d5 100644 --- a/src/output/pulse_output_plugin.c +++ b/src/output/pulse_output_plugin.c @@ -25,6 +25,8 @@ #include <glib.h> +#include <libavutil/samplefmt.h> + #include <pulse/thread-mainloop.h> #include <pulse/context.h> #include <pulse/stream.h> @@ -616,7 +618,7 @@ pulse_output_open(struct audio_output *ao, struct audio_format *audio_format, /* MPD doesn't support the other pulseaudio sample formats, so we just force MPD to send us everything as 16 bit */ - audio_format->format = SAMPLE_FORMAT_S16; + audio_format->format = AV_SAMPLE_FMT_S16; ss.format = PA_SAMPLE_S16NE; ss.rate = audio_format->sample_rate; |