This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit d333beb8b52b10dd069aab4b835f5826094ff2ee Author: Andreas Rheinhardt <[email protected]> AuthorDate: Tue Mar 3 18:19:21 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 17:15:02 2026 +0200 avdevice: Remove deprecated FF_API_ALSA_CHANNELS Deprecated since 2025-02-01. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavdevice/alsa.h | 3 --- libavdevice/alsa_dec.c | 10 ---------- libavdevice/version_major.h | 2 -- 3 files changed, 15 deletions(-) diff --git a/libavdevice/alsa.h b/libavdevice/alsa.h index d3dfa478c5..f6a85616a8 100644 --- a/libavdevice/alsa.h +++ b/libavdevice/alsa.h @@ -52,9 +52,6 @@ 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; diff --git a/libavdevice/alsa_dec.c b/libavdevice/alsa_dec.c index 63409a7785..e3f73911de 100644 --- a/libavdevice/alsa_dec.c +++ b/libavdevice/alsa_dec.c @@ -73,13 +73,6 @@ static av_cold int audio_read_header(AVFormatContext *s1) } codec_id = s1->audio_codec_id; -#if FF_API_ALSA_CHANNELS - if (s->channels > 0) { - av_channel_layout_uninit(&s->ch_layout); - s->ch_layout.nb_channels = s->channels; - } -#endif - ret = ff_alsa_open(s1, SND_PCM_STREAM_CAPTURE, &s->sample_rate, &s->ch_layout, &codec_id); if (ret < 0) { @@ -157,9 +150,6 @@ static int audio_get_device_list(AVFormatContext *h, AVDeviceInfoList *device_li static const AVOption options[] = { { "sample_rate", "", offsetof(AlsaData, sample_rate), AV_OPT_TYPE_INT, {.i64 = 48000}, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, -#if FF_API_ALSA_CHANNELS - { "channels", "", offsetof(AlsaData, channels), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_DEPRECATED }, -#endif { "ch_layout", "", offsetof(AlsaData, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = "2C"}, INT_MIN, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, }; diff --git a/libavdevice/version_major.h b/libavdevice/version_major.h index 191511cdcc..2df1f3a2d4 100644 --- a/libavdevice/version_major.h +++ b/libavdevice/version_major.h @@ -33,6 +33,4 @@ * the public API and may change, break or disappear at any time. */ -#define FF_API_ALSA_CHANNELS (LIBAVDEVICE_VERSION_MAJOR < 63) - #endif /* AVDEVICE_VERSION_MAJOR_H */ _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
