[FFmpeg-cvslog] aacdec_usac: remove fallback for custom maps with invalid position

Lynne git at videolan.org
Sat Jun 8 01:23:06 EEST 2024


ffmpeg | branch: master | Lynne <dev at lynne.ee> | Wed Jun  5 18:43:08 2024 +0200| [ae495b56ffc9a80fffe608e5ef42720ea968952d] | committer: Lynne

aacdec_usac: remove fallback for custom maps with invalid position

Not needed as every possible index is mapped.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae495b56ffc9a80fffe608e5ef42720ea968952d
---

 libavcodec/aac/aacdec_usac.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c
index b12eda90e1..04dd5facff 100644
--- a/libavcodec/aac/aacdec_usac.c
+++ b/libavcodec/aac/aacdec_usac.c
@@ -371,8 +371,6 @@ int ff_aac_usac_config_decode(AACDecContext *ac, AVCodecContext *avctx,
         for (int i = 0; i < nb_channels; i++) {
             AVChannelCustom *cm = &ac->oc[1].ch_layout.u.map[i];
             cm->id = usac_ch_pos_to_av[get_bits(gb, 5)]; /* bsOutputChannelPos */
-            if (cm->id == AV_CHAN_NONE)
-                cm->id = AV_CHAN_UNKNOWN;
         }
 
         ret = av_channel_layout_retype(&ac->oc[1].ch_layout,



More information about the ffmpeg-cvslog mailing list