Merge commit '38389058c3308758c6365abd0f6b45c5e62bb90b'

[ffmpeg] / libavdevice / pulse_audio_common.h

diff --git a/libavdevice/pulse_audio_common.h b/libavdevice/pulse_audio_common.h
index 99ba6a31f16255843eac118b2d659fc0c59716ab..b049cdea1a2ef338b0eb843b6539fdd54fd0b68b 100644 (file)
--- a/libavdevice/pulse_audio_common.h
+++ b/libavdevice/pulse_audio_common.h
@@ -22,9 +22,12 @@
 #ifndef AVDEVICE_PULSE_AUDIO_COMMON_H
 #define AVDEVICE_PULSE_AUDIO_COMMON_H
 
-#include <pulse/simple.h>
+#include <pulse/pulseaudio.h>
 #include "libavcodec/avcodec.h"
+#include "avdevice.h"
 
 pa_sample_format_t ff_codec_id_to_pulse_format(enum AVCodecID codec_id);
 
+int ff_pulse_audio_get_devices(AVDeviceInfoList *devices, const char *server, int output);
+
 #endif /* AVDEVICE_PULSE_AUDIO_COMMON_H */