virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912'

Browse Source 
* commit 'f6f36ca8ca1b2526d3abff7d7c627322d3bce912':
  indeo: Refactor ff_ivi_dec_huff_desc

Conflicts:
	libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-05 11:49:56 +02:00
commit 0e2056056f
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/ivi_common.c
View File

@ -157,7 +157,9 @@ int ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab,
/* select default table */ /* select default table */
huff_tab->tab = (which_tab) ? &ivi_blk_vlc_tabs[7] huff_tab->tab = (which_tab) ? &ivi_blk_vlc_tabs[7]
: &ivi_mb_vlc_tabs [7]; : &ivi_mb_vlc_tabs [7];
} else { return 0;
}
huff_tab->tab_sel = get_bits(gb, 3); huff_tab->tab_sel = get_bits(gb, 3);
if (huff_tab->tab_sel == 7) { if (huff_tab->tab_sel == 7) {
/* custom huffman table (explicitly encoded) */ /* custom huffman table (explicitly encoded) */
@ -179,7 +181,8 @@ int ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab,
result = ivi_create_huff_from_desc(&huff_tab->cust_desc, result = ivi_create_huff_from_desc(&huff_tab->cust_desc,
&huff_tab->cust_tab, 0); &huff_tab->cust_tab, 0);
if (result) { if (result) {
huff_tab->cust_desc.num_rows = 0; // reset faulty description // reset faulty description
huff_tab->cust_desc.num_rows = 0;
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"Error while initializing custom vlc table!\n"); "Error while initializing custom vlc table!\n");
return result; return result;
@ -191,7 +194,6 @@ int ff_ivi_dec_huff_desc(GetBitContext *gb, int desc_coded, int which_tab,
huff_tab->tab = (which_tab) ? &ivi_blk_vlc_tabs[huff_tab->tab_sel] huff_tab->tab = (which_tab) ? &ivi_blk_vlc_tabs[huff_tab->tab_sel]
: &ivi_mb_vlc_tabs [huff_tab->tab_sel]; : &ivi_mb_vlc_tabs [huff_tab->tab_sel];
} }
}
return 0; return 0;
} }