diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-09-27 12:53:36 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-09-27 12:53:36 +0000 |
| commit | 77e6971bbb683a634197fe71f56f6243955dd61a (patch) | |
| tree | b83834c3a29a0f7612d663debc3b6d25967ed2fe /libopenjpeg/tcd.c | |
| parent | a9a1336502b180a5902ba2a523d59ee67716e82d (diff) | |
[trunk] remove t2_encode_packet and t2_encode_packets
rename from t2_encode_packets_v2 to opj_t2_encode_packets
Diffstat (limited to 'libopenjpeg/tcd.c')
| -rw-r--r-- | libopenjpeg/tcd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libopenjpeg/tcd.c b/libopenjpeg/tcd.c index b753f649..f92031c7 100644 --- a/libopenjpeg/tcd.c +++ b/libopenjpeg/tcd.c @@ -493,7 +493,7 @@ opj_bool opj_tcd_rateallocate( opj_tcd_v2_t *tcd, if (cp->m_specific_param.m_enc.m_fixed_quality) { /* fixed_quality */ if(cp->m_specific_param.m_enc.m_cinema){ - if (! t2_encode_packets_v2(t2,tcd->tcd_tileno, tcd_tile, layno + 1, dest, p_data_written, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC)) { + if (! opj_t2_encode_packets(t2,tcd->tcd_tileno, tcd_tile, layno + 1, dest, p_data_written, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC)) { lo = thresh; continue; @@ -522,7 +522,7 @@ opj_bool opj_tcd_rateallocate( opj_tcd_v2_t *tcd, lo = thresh; } } else { - if (! t2_encode_packets_v2(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest,p_data_written, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC)) + if (! opj_t2_encode_packets(t2, tcd->tcd_tileno, tcd_tile, layno + 1, dest,p_data_written, maxlen, cstr_info,tcd->cur_tp_num,tcd->tp_pos,tcd->cur_pino,THRESH_CALC)) { /* TODO: what to do with l ??? seek / tell ??? */ /* opj_event_msg(tcd->cinfo, EVT_INFO, "rate alloc: len=%d, max=%d\n", l, maxlen); */ @@ -1965,7 +1965,7 @@ opj_bool opj_tcd_t2_encode (opj_tcd_v2_t *p_tcd, return OPJ_FALSE; } - if (! t2_encode_packets_v2( + if (! opj_t2_encode_packets( l_t2, p_tcd->tcd_tileno, p_tcd->tcd_image->tiles, |