diff options
| author | James Almer <jamrial@gmail.com> | 2022-03-20 15:18:50 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-22 08:45:38 -0300 |
| commit | e42e54fa4e9df258df77e9f3f2e78f6a6a44e686 (patch) | |
| tree | 77bdaa6fdb28d6b7e83a57172eda40758f06ea85 /libavformat | |
| parent | 5cd6cb9f051059bc2f24020755d87debea715c28 (diff) | |
avformat/pcmdec: add support to set channel layout in sln demuxer
Deprecate the channels option, and ensure ch_layout has priority if set over
channels, until the latter is gone.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/pcmdec.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/pcmdec.c b/libavformat/pcmdec.c index 51b1098430..11ba0b5c0c 100644 --- a/libavformat/pcmdec.c +++ b/libavformat/pcmdec.c @@ -180,7 +180,12 @@ PCMDEF(vidc, "PCM Archimedes VIDC", NULL, VIDC) #if CONFIG_SLN_DEMUXER static const AVOption sln_options[] = { { "sample_rate", "", offsetof(PCMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 8000}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, - { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, +#if FF_API_OLD_CHANNEL_LAYOUT + { "channels", "", offsetof(PCMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_DEPRECATED }, + { "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = NULL}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, +#else + { "ch_layout", "", offsetof(PCMAudioDemuxerContext, ch_layout), AV_OPT_TYPE_CHLAYOUT, {.str = "mono"}, 0, 0, AV_OPT_FLAG_DECODING_PARAM }, +#endif { NULL }, }; |