History

avcodec/intrax8: Fix assert

Commit 900ce6f8c3526f27173057bb955f54f4f4f41246 replaced IntraX8Context.ac_vlc by IntraX8Context.ac_vlc_table, but forgot to update an av_assert2()*. cf7ed01938a4d8b2ccd28f1fadacd79103e54eed then replaced this with a check for j_ac_vlc[mode], but this makes no sense as j_ac_vlc is of type const VLCElem [2][2][8][]. Worse yet, mode can be up to three and then j_ac_vlc[mode] is undefined behaviour. This happened during the wmv8-x8intra FATE test. *: Since 84f16bb5e68dc47eca4dc96b3391c58471cd7328 config.h was no longer auto-included in avassert.h and this disabled av_assert1() and av_assert2() in files where config.h has not been included before the inclusion of avassert.h.

Andreas Rheinhardt committed 2 years ago

Commit 4a134eb1 parent d263fce1 file · +1 −1Browse files

Unified · Split

libavcodec/intrax8.c+1−1
@@ -103,7 +103,7 @@ static inline void x8_select_ac_table(IntraX8Context *const w, int mode) · 102 unmodified lines
103103 table_index = get_bits(w->gb, 3);
104104 // 2 modes use same tables
105105 w->j_ac_vlc_table[mode] = j_ac_vlc[w->quant < 13][mode >> 1][table_index];
106− av_assert2(j_ac_vlc[mode]);
106+ av_assert2(w->j_ac_vlc_table[mode]);
107107 }
108108
109109 static inline int x8_get_orient_vlc(IntraX8Context *w)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t