diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-06-05 07:02:53 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2022-03-15 09:42:29 -0300 |
| commit | 09b5d3fb44ae1036700f80c8c80b15e9074c58c3 (patch) | |
| tree | a89932ad3a2b8050c6fc3f93715bfb3a31dab5c8 /libavformat/dump.c | |
| parent | f423497b455da06c1337846902c770028760e094 (diff) | |
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>
Diffstat (limited to 'libavformat/dump.c')
| -rw-r--r-- | libavformat/dump.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavformat/dump.c b/libavformat/dump.c index 4824965ee9..69b838fbc7 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -164,8 +164,11 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd) { int size = sd->size; const uint8_t *data = sd->data; - uint32_t flags, channels, sample_rate, width, height; + 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; @@ -174,6 +177,8 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd) 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; @@ -191,6 +196,8 @@ static void dump_paramchange(void *ctx, const AVPacketSideData *sd) av_log(ctx, AV_LOG_INFO, "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; |