Revision ba17363f libavcodec/h264.c

View differences:

libavcodec/h264.c
5363 5363
        else
5364 5364
            ctx = 3;
5365 5365
        val++;
5366
        if(val > 52) //prevent infinite loop
5367
            return INT_MIN;
5366 5368
    }
5367 5369

  
5368 5370
    if( val&0x01 )
......
6548 6550
                    bS[0] = bS[1] = bS[2] = bS[3] = 3;
6549 6551
                } else {
6550 6552
                    // TODO
6551
                    assert(0);
6553
                    av_log(h->s.avctx, AV_LOG_ERROR, "both non intra (TODO)\n");
6552 6554
                }
6553 6555
                /* Filter edge */
6554 6556
                // Do not use s->qscale as luma quantizer because it has not the same
......
6569 6571
                    bS[0] = bS[1] = bS[2] = bS[3] = 3;
6570 6572
                } else {
6571 6573
                    // TODO
6572
                    assert(0);
6574
                    av_log(h->s.avctx, AV_LOG_ERROR, "both non intra (TODO)\n");
6573 6575
                }
6574 6576
                /* Filter edge */
6575 6577
                // Do not use s->qscale as luma quantizer because it has not the same
......
6701 6703

  
6702 6704
                if(ret>=0) ret = decode_mb_cabac(h);
6703 6705

  
6704
                hl_decode_mb(h);
6706
                if(ret>=0) hl_decode_mb(h);
6705 6707
                s->mb_y--;
6706 6708
            }
6707 6709
            eos = get_cabac_terminate( &h->cabac );

Also available in: Unified diff