RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: drop the channel layout compat layer for old-style (de)muxers 

All the (de)muxers have been converted to the new API.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Anton Khirnov 2019-05-22 09:07:44 +02:00 committed by James Almer
parent 4f7c45208e
commit b6746b7462
2 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/demux.c
View File

@ -194,18 +194,6 @@ static int update_stream_avctx(AVFormatContext *s)
sti->parser = NULL;
}
/* if the demuxer exports old channel layouts, convert it to new */
if (!st->codecpar->ch_layout.nb_channels &&
st->codecpar->channels) {
if (st->codecpar->channel_layout) {
av_channel_layout_from_mask(&st->codecpar->ch_layout,
st->codecpar->channel_layout);
} else {
st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
st->codecpar->ch_layout.nb_channels = st->codecpar->channels;
}
}
#if FF_API_OLD_CHANNEL_LAYOUT
FF_DISABLE_DEPRECATION_WARNINGS
if (st->codecpar->ch_layout.nb_channels &&

9
libavformat/mux.c
View File

@ -273,15 +273,6 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
goto fail;
}
/* if the new-style channel layout is set, convert it to old one
* for old-style muxers */
if (par->ch_layout.nb_channels &&
!par->channels) {
par->channels = par->ch_layout.nb_channels;
par->channel_layout = par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ?
par->ch_layout.u.mask : 0;
}
#if FF_API_OLD_CHANNEL_LAYOUT
FF_DISABLE_DEPRECATION_WARNINGS
/* if the caller is using the deprecated channel layout API,