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/pcm_mix.h | |
| 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/pcm_mix.h')
| -rw-r--r-- | src/pcm_mix.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pcm_mix.h b/src/pcm_mix.h index 0e58d01e..6be4e4e9 100644 --- a/src/pcm_mix.h +++ b/src/pcm_mix.h @@ -25,6 +25,8 @@ #include <stdbool.h> #include <stddef.h> +#include <libavutil/samplefmt.h> + /* * Linearly mixes two PCM buffers. Both must have the same length and * the same audio format. The formula is: @@ -41,9 +43,7 @@ * * @return true on success, false if the format is not supported */ -G_GNUC_WARN_UNUSED_RESULT -bool -pcm_mix(void *buffer1, const void *buffer2, size_t size, - enum sample_format format, float portion1); +bool pcm_mix(void *buffer1, const void *buffer2, size_t size, + enum AVSampleFormat format, float portion1); #endif |