← Back to branch summary

~ubuntu-branches/ubuntu/maverick/x264/maverick-updates

« back to all changes in this revision

Viewing changes to encoder/cavlc.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2010-02-18 07:39:51 UTC
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: james.westby@ubuntu.com-20100218073951-9jgsvskb976rfbvq
Tags: upstream-0.85.1442.1+git781d30
Import upstream version 0.85.1442.1+git781d30

Show diffs side-by-side

added added

removed removed

Lines of Context:
encoder/cavlc.c
147
147
 
148
148
    if( i_trailing < i_total )
149
149
    {
150
 
        int16_t val = runlevel.level[i_trailing];
151
 
        int16_t val_original = runlevel.level[i_trailing]+LEVEL_TABLE_SIZE/2;
152
 
        if( i_trailing < 3 )
153
 
            val -= (val>>15)|1; /* as runlevel.level[i] can't be 1 for the first one if i_trailing < 3 */
 
150
        int val = runlevel.level[i_trailing];
 
151
        int val_original = runlevel.level[i_trailing]+LEVEL_TABLE_SIZE/2;
 
152
        val -= ((val>>31)|1) & -(i_trailing < 3); /* as runlevel.level[i] can't be 1 for the first one if i_trailing < 3 */
154
153
        val += LEVEL_TABLE_SIZE/2;
155
154
 
156
155
        if( (unsigned)val_original < LEVEL_TABLE_SIZE )