Merge "Limit iterations when parsing mkv file" into rvc-dev

}

void BlockIterator::advance_l() {

    for (;;) {

    for (int i = 0;; i++) {

        if (i == 1000) {

            ALOGE("no block found after %d iterations, stopping", i);

            mCluster = NULL;

            break;

        }

        long res = mCluster->GetEntry(mBlockEntryIndex, mBlockEntry);

        ALOGV("GetEntry returned %ld", res);