diff options
| author | Antonin Descampe <antonin@gmail.com> | 2014-04-17 09:31:37 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2014-04-17 09:31:37 +0000 |
| commit | 7199d9b5d32e9974afa62243756b027fc394f860 (patch) | |
| tree | 909c03c737feed9462147776f988d0059e58a928 /src/lib/openjp2/pi.c | |
| parent | d19a4ab6768c48b542c0add922eba0dcddae9ffe (diff) | |
[trunk] refactoring of rsiz, profiles, and extensions management
Diffstat (limited to 'src/lib/openjp2/pi.c')
| -rw-r--r-- | src/lib/openjp2/pi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/openjp2/pi.c b/src/lib/openjp2/pi.c index 02bbefee..1d8db41b 100644 --- a/src/lib/openjp2/pi.c +++ b/src/lib/openjp2/pi.c @@ -1525,7 +1525,7 @@ opj_pi_iterator_t *opj_pi_initialise_encode(const opj_image_t *p_image, opj_free(l_tmp_ptr); l_tmp_ptr = 00; - if (l_tcp->POC && ( p_cp->m_specific_param.m_enc.m_cinema || p_t2_mode == FINAL_PASS)) { + if (l_tcp->POC && (OPJ_IS_CINEMA(p_cp->rsiz) || p_t2_mode == FINAL_PASS)) { opj_pi_update_encode_poc_and_final(p_cp,p_tile_no,l_tx0,l_tx1,l_ty0,l_ty1,l_max_prec,l_max_res,l_dx_min,l_dy_min); } else { @@ -1554,7 +1554,7 @@ void opj_pi_create_encode( opj_pi_iterator_t *pi, pi[pino].first = 1; pi[pino].poc.prg = tcp->prg; - if(!(cp->m_specific_param.m_enc.m_tp_on && ((!cp->m_specific_param.m_enc.m_cinema && (t2_mode == FINAL_PASS)) || cp->m_specific_param.m_enc.m_cinema))){ + if(!(cp->m_specific_param.m_enc.m_tp_on && ((!OPJ_IS_CINEMA(cp->rsiz) && (t2_mode == FINAL_PASS)) || OPJ_IS_CINEMA(cp->rsiz)))){ pi[pino].poc.resno0 = tcp->resS; pi[pino].poc.resno1 = tcp->resE; pi[pino].poc.compno0 = tcp->compS; |