diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 02:08:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-04 02:08:48 +0100 |
| commit | e1351662063d6aa9c0a04b869afc88b252155de8 (patch) | |
| tree | e76a428240dabe9bd4b8f50d50c8bb223b1e171a /libavdevice/pulse_audio_common.h | |
| parent | 1a4ffa5b136a112935e7db19eb49e6042c6d5143 (diff) | |
| parent | babf20a215ffdf2ecf323a77c95c2a4c4360b371 (diff) | |
| download | ffmpeg-e1351662063d6aa9c0a04b869afc88b252155de8.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd/pulse: add ff_ prefix and fix param type
lavd/pulse_audio_enc: fix flush return code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/pulse_audio_common.h')
| -rw-r--r-- | libavdevice/pulse_audio_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavdevice/pulse_audio_common.h b/libavdevice/pulse_audio_common.h index e4409ba18b..99ba6a31f1 100644 --- a/libavdevice/pulse_audio_common.h +++ b/libavdevice/pulse_audio_common.h @@ -23,7 +23,8 @@ #define AVDEVICE_PULSE_AUDIO_COMMON_H #include <pulse/simple.h> +#include "libavcodec/avcodec.h" -pa_sample_format_t codec_id_to_pulse_format(int codec_id); +pa_sample_format_t ff_codec_id_to_pulse_format(enum AVCodecID codec_id); #endif /* AVDEVICE_PULSE_AUDIO_COMMON_H */ |