Revision 268a618b

View differences:

libavcodec/interplayvideo.c
386 386
    memcpy(P, s->stream_ptr, 4);
387 387
    s->stream_ptr += 4;
388 388

  
389
    if ((P[0] <= P[1]) && (P[2] <= P[3])) {
389
    if (P[0] <= P[1]) {
390
        if (P[2] <= P[3]) {
390 391

  
391 392
        /* 1 of 4 colors for each pixel, need 16 more bytes */
392 393
        CHECK_STREAM_PTR(16);
......
400 401
            s->pixel_ptr += s->line_inc;
401 402
        }
402 403

  
403
    } else if ((P[0] <= P[1]) && (P[2] > P[3])) {
404
        } else {
404 405
        uint32_t flags;
405 406

  
406 407
        /* 1 of 4 colors for each 2x2 block, need 4 more bytes */
......
418 419
            s->pixel_ptr += s->stride * 2;
419 420
        }
420 421

  
421
    } else if ((P[0] > P[1]) && (P[2] <= P[3])) {
422
        }
423
    } else {
424
        if (P[2] <= P[3]) {
422 425
        uint64_t flags;
423 426

  
424 427
        /* 1 of 4 colors for each 2x1 block, need 8 more bytes */
......
432 435
            }
433 436
            s->pixel_ptr += s->stride;
434 437
        }
435

  
436
    } else {
438
        } else {
437 439
        uint64_t flags;
438 440

  
439 441
        /* 1 of 4 colors for each 1x2 block, need 8 more bytes */
......
447 449
            }
448 450
            s->pixel_ptr += s->stride * 2;
449 451
        }
452
        }
450 453
    }
451 454

  
452 455
    /* report success */

Also available in: Unified diff