Skip to content

F
ffmpeg
Commit 26e0454c authored by Marton Balint's avatar Marton Balint
Browse files
Options

avformat/mov_chan: simplify channel layout canonicalization 

Signed-off-by: 's avatarMarton Balint <cus@passwd.hu>
parent ed620727
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
libavformat/mov_chan.c
View file @ 26e0454c
......@@ -543,10 +543,8 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st,
ch_layout->u.map[i].id = mov_get_channel_id(label);
}
ret = av_channel_layout_retype(ch_layout, AV_CHANNEL_ORDER_NATIVE, AV_CHANNEL_LAYOUT_RETYPE_FLAG_LOSSLESS);
if (ret == AVERROR(ENOSYS))
ret = av_channel_layout_retype(ch_layout, AV_CHANNEL_ORDER_UNSPEC, AV_CHANNEL_LAYOUT_RETYPE_FLAG_LOSSLESS);
if (ret < 0 && ret != AVERROR(ENOSYS))
ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL);
if (ret < 0)
goto out;
} else {
uint64_t mask = mov_get_channel_layout(layout_tag, bitmap);
......@@ -843,10 +841,8 @@ int ff_mov_read_chnl(AVFormatContext *s, AVIOContext *pb, AVStream *st)
ch_layout->u.map[i].id = channel;
}
ret = av_channel_layout_retype(ch_layout, AV_CHANNEL_ORDER_NATIVE, AV_CHANNEL_LAYOUT_RETYPE_FLAG_LOSSLESS);
if (ret == AVERROR(ENOSYS))
ret = av_channel_layout_retype(ch_layout, AV_CHANNEL_ORDER_UNSPEC, AV_CHANNEL_LAYOUT_RETYPE_FLAG_LOSSLESS);
if (ret < 0 && ret != AVERROR(ENOSYS))
ret = av_channel_layout_retype(ch_layout, 0, AV_CHANNEL_LAYOUT_RETYPE_FLAG_CANONICAL);
if (ret < 0)
return ret;
} else {
uint64_t omitted_channel_map = avio_rb64(pb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment