diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-06-20 17:15:28 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-06-20 17:15:28 +0000 |
| commit | 284b041b1c4f96686676d57e05445e9e9331d359 (patch) | |
| tree | 5092c39e312e422eb2e8ffab60e050f5d608f884 /libavcodec/ps.c | |
| parent | be90cd27181c1021d89a203bd112d4d06e12d20d (diff) | |
| download | ffmpeg-284b041b1c4f96686676d57e05445e9e9331d359.tar.gz | |
Remove iid_mode from the PS context.
Originally committed as revision 23658 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ps.c')
| -rw-r--r-- | libavcodec/ps.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/ps.c b/libavcodec/ps.c index 6f4860fa60..2010f004a5 100644 --- a/libavcodec/ps.c +++ b/libavcodec/ps.c @@ -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) { |