RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove iid_mode from the PS context. 

Originally committed as revision 23658 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2010-06-20 17:15:28 +00:00
parent be90cd2718
commit 284b041b1c
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/ps.c
View File

@ -156,15 +156,15 @@ int ff_ps_read_data(AVCodecContext *avctx, GetBitContext *gb_host, PSContext *ps
if (header) { //enable_ps_header
ps->enable_iid = get_bits1(gb);
if (ps->enable_iid) {
ps->iid_mode = get_bits(gb, 3);
if (ps->iid_mode > 5) {
int iid_mode = get_bits(gb, 3);
if (iid_mode > 5) {
av_log(avctx, AV_LOG_ERROR, "iid_mode %d is reserved.\n",
ps->iid_mode);
iid_mode);
goto err;
}
ps->nr_iid_par = nr_iidicc_par_tab[ps->iid_mode];
ps->iid_quant = ps->iid_mode > 2;
ps->nr_ipdopd_par = nr_iidopd_par_tab[ps->iid_mode];
ps->nr_iid_par = nr_iidicc_par_tab[iid_mode];
ps->iid_quant = iid_mode > 2;
ps->nr_ipdopd_par = nr_iidopd_par_tab[iid_mode];
}
ps->enable_icc = get_bits1(gb);
if (ps->enable_icc) {

1
libavcodec/ps.h
View File

@ -37,7 +37,6 @@
typedef struct {
int start;
int enable_iid;
int iid_mode;
int iid_quant;
int nr_iid_par;
int nr_ipdopd_par;