From e531e73a6f0f7b4099ef5ed7ede949e4f75d106c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Wed, 18 Apr 2012 16:42:34 +0200 Subject: indeo: Make sure the to be used vlc table has been initilaized. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/ivi_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/ivi_common.c') diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index c5039b32c9..7d93f6be60 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -128,7 +128,7 @@ int ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab, new_huff.xbits[i] = get_bits(gb, 4); /* Have we got the same custom table? Rebuild if not. */ - if (ff_ivi_huff_desc_cmp(&new_huff, &huff_tab->cust_desc)) { + if (ff_ivi_huff_desc_cmp(&new_huff, &huff_tab->cust_desc) || !huff_tab->cust_tab.table) { ff_ivi_huff_desc_copy(&huff_tab->cust_desc, &new_huff); if (huff_tab->cust_tab.table) -- cgit v1.2.1