You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-06-30 22:24:04 +02:00
lavc: deprecate channel count/layout changing side data
They are incompatible with the new channel layout scheme and no decoder uses them. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
committed by
James Almer
parent
f423497b45
commit
09b5d3fb44
@ -1329,6 +1329,9 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels,
|
||||
uint8_t *data;
|
||||
if (!pkt)
|
||||
return AVERROR(EINVAL);
|
||||
|
||||
#if FF_API_OLD_CHANNEL_LAYOUT
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
if (channels) {
|
||||
size += 4;
|
||||
flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT;
|
||||
@ -1337,6 +1340,8 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels,
|
||||
size += 8;
|
||||
flags |= AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT;
|
||||
}
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
#endif
|
||||
if (sample_rate) {
|
||||
size += 4;
|
||||
flags |= AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE;
|
||||
@ -1349,10 +1354,14 @@ int ff_add_param_change(AVPacket *pkt, int32_t channels,
|
||||
if (!data)
|
||||
return AVERROR(ENOMEM);
|
||||
bytestream_put_le32(&data, flags);
|
||||
#if FF_API_OLD_CHANNEL_LAYOUT
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
if (channels)
|
||||
bytestream_put_le32(&data, channels);
|
||||
if (channel_layout)
|
||||
bytestream_put_le64(&data, channel_layout);
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
#endif
|
||||
if (sample_rate)
|
||||
bytestream_put_le32(&data, sample_rate);
|
||||
if (width || height) {
|
||||
|
Reference in New Issue
Block a user