From 0bbe5ac82ef2845efafbf190044f16712db113b2 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Tue, 23 Apr 2013 15:30:50 +0200
Subject: Switch to Libav sample formats everywhere.

Drop 24bit format for now. It should be restored later by properly
distinguishing between internal and packed formats.
---
 src/output/pulse_output_plugin.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/output/pulse_output_plugin.c')

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;
-- 
cgit v1.2.3