mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
Merge commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2'
* commit '77ab341c0c6cdf2bd437bb48d429e797d1e60da2': aacdec: add default case in channel layout Conflicts: libavcodec/aacdec.c Note, the default case is currently unreachable See: a48b890392aa22033f182421ba9e3f3b3256461d Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ae4bb6c488
@ -703,6 +703,7 @@ static void decode_channel_map(uint8_t layout_map[][3],
|
||||
syn_ele = TYPE_LFE;
|
||||
break;
|
||||
default:
|
||||
// AAC_CHANNEL_OFF has no channel map
|
||||
av_assert0(0);
|
||||
}
|
||||
layout_map[0][0] = syn_ele;
|
||||
|
Loading…
x
Reference in New Issue
Block a user