diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-18 04:38:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-18 04:57:23 +0200 |
| commit | a614f892a6cf9976ce861d22a113fe4597ec1af1 (patch) | |
| tree | 95e214cfa7e5584b6e63fd8cca79ddd3776bdace /libavdevice/pulse_audio_common.h | |
| parent | 27998451d86d2da50a20317d0442fa0d6e77100b (diff) | |
| parent | 35bf7a491e4df3399a36588e1377c39e8d5a7e64 (diff) | |
| download | ffmpeg-a614f892a6cf9976ce861d22a113fe4597ec1af1.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/pulse_audio_enc: implement pause messages
lavd/pulse_audio_enc: implement volume messages
lavd/avdevice: add volume messages
lavd/pulse_audio_enc: add buffer fullness messages
lavd/pulse_audio_enc: add nonblocking mode
lavd/pulse_audio_enc: replace simple API with async API
lavd/pulse_audio_enc: cosmetics
lavd/pulse_audio_common: add context helper functions
lavd/pulse_audio_common: rename variables and enums
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/pulse_audio_common.h')
| -rw-r--r-- | libavdevice/pulse_audio_common.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavdevice/pulse_audio_common.h b/libavdevice/pulse_audio_common.h index b049cdea1a..02534f79a1 100644 --- a/libavdevice/pulse_audio_common.h +++ b/libavdevice/pulse_audio_common.h @@ -30,4 +30,9 @@ 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); +int ff_pulse_audio_connect_context(pa_mainloop **pa_ml, pa_context **pa_ctx, + const char *server, const char *description); + +void ff_pulse_audio_disconnect_context(pa_mainloop **pa_ml, pa_context **pa_ctx); + #endif /* AVDEVICE_PULSE_AUDIO_COMMON_H */ |