mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-12-25 00:10:00 +01:00
avutil: remove deprecated FF_API_OLD_CHANNEL_LAYOUT
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
@@ -177,10 +177,6 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd, int log_leve
|
||||
int size = sd->size;
|
||||
const uint8_t *data = sd->data;
|
||||
uint32_t flags, sample_rate, width, height;
|
||||
#if FF_API_OLD_CHANNEL_LAYOUT
|
||||
uint32_t channels;
|
||||
uint64_t layout;
|
||||
#endif
|
||||
|
||||
if (!data || sd->size < 4)
|
||||
goto fail;
|
||||
@@ -189,27 +185,6 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd, int log_leve
|
||||
data += 4;
|
||||
size -= 4;
|
||||
|
||||
#if FF_API_OLD_CHANNEL_LAYOUT
|
||||
FF_DISABLE_DEPRECATION_WARNINGS
|
||||
if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT) {
|
||||
if (size < 4)
|
||||
goto fail;
|
||||
channels = AV_RL32(data);
|
||||
data += 4;
|
||||
size -= 4;
|
||||
av_log(ctx, log_level, "channel count %"PRIu32", ", channels);
|
||||
}
|
||||
if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) {
|
||||
if (size < 8)
|
||||
goto fail;
|
||||
layout = AV_RL64(data);
|
||||
data += 8;
|
||||
size -= 8;
|
||||
av_log(ctx, log_level,
|
||||
"channel layout: %s, ", av_get_channel_name(layout));
|
||||
}
|
||||
FF_ENABLE_DEPRECATION_WARNINGS
|
||||
#endif /* FF_API_OLD_CHANNEL_LAYOUT */
|
||||
if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) {
|
||||
if (size < 4)
|
||||
goto fail;
|
||||
|
||||
Reference in New Issue
Block a user