virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-14 22:15:12 +02:00
Code Issues Releases Activity

lavc: deprecate channel count/layout changing side data

Browse Source 
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:
Anton Khirnov
2013-06-05 07:02:53 +02:00
committed by James Almer
parent f423497b45
commit 09b5d3fb44
5 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/dump.c
View File

@ -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;