diff options
| author | James Almer <jamrial@gmail.com> | 2025-01-28 09:57:57 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2025-02-01 01:12:17 -0300 |
| commit | c6194b50b1b4001db23e8debab4ac4444e794f90 (patch) | |
| tree | 6c6835c5606021757b306fa8c00ee555a0da7c2c /libavdevice/alsa.h | |
| parent | 0fe33c99a26a06a6875c4abfb96362a65145264b (diff) | |
| download | ffmpeg-c6194b50b1b4001db23e8debab4ac4444e794f90.tar.gz | |
avdevice/alsa_dec: add a ch_layout option
Missed in ffc4fd3cc2ccb2cadb71f19849842b18ca1281c6, which after
e78173557da898f18a78241cc3525b76694164b5 broke setting channel count.
Should fix ticket #11434.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavdevice/alsa.h')
| -rw-r--r-- | libavdevice/alsa.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavdevice/alsa.h b/libavdevice/alsa.h index 07783c983a..3e1ba31384 100644 --- a/libavdevice/alsa.h +++ b/libavdevice/alsa.h @@ -35,6 +35,7 @@ #include "libavutil/log.h" #include "timefilter.h" #include "avdevice.h" +#include "version.h" /* XXX: we make the assumption that the soundcard accepts this format */ /* XXX: find better solution with "preinit" method, needed also in @@ -51,7 +52,10 @@ typedef struct AlsaData { int frame_size; ///< bytes per sample * channels int period_size; ///< preferred size for reads and writes, in frames int sample_rate; ///< sample rate set by user +#if FF_API_ALSA_CHANNELS int channels; ///< number of channels set by user +#endif + AVChannelLayout ch_layout; ///< Channel layout set by user int last_period; TimeFilter *timefilter; void (*reorder_func)(const void *, void *, int); |