[FFmpeg-cvslog] indeo: Make sure the to be used vlc table has been initilaized.

Michael Niedermayer git at videolan.org
Wed Apr 18 17:15:55 CEST 2012


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 18 16:42:34 2012 +0200| [e531e73a6f0f7b4099ef5ed7ede949e4f75d106c] | committer: Michael Niedermayer

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 <michaelni at gmx.at>

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

 libavcodec/ivi_common.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index c5039b3..7d93f6b 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)



More information about the ffmpeg-cvslog mailing list